Merge pull request #14 from elemoine/stacklight-alarm
Add alarms and alarm clusters
diff --git a/elasticsearch/client.sls b/elasticsearch/client.sls
index f336cd3..4c8246e 100644
--- a/elasticsearch/client.sls
+++ b/elasticsearch/client.sls
@@ -8,6 +8,10 @@
- user: root
- group: root
+elasticsearch_client_packages:
+ pkg.installed:
+ - names: {{ client.pkgs }}
+
{%- for index_name, index in client.get('index', {}).iteritems() %}
elasticsearch_index_{{ index_name }}:
{%- if index.get('enabled', False) %}
@@ -19,6 +23,8 @@
elasticsearch_index_template.absent:
- name: {{ index_name }}
{%- endif %}
+ - require:
+ - pkg: elasticsearch_client_packages
{%- endfor %}
{%- endif %}
diff --git a/elasticsearch/files/grafana_influxdb.json b/elasticsearch/files/grafana_influxdb.json
index 2a07913..1697da0 100644
--- a/elasticsearch/files/grafana_influxdb.json
+++ b/elasticsearch/files/grafana_influxdb.json
@@ -17,10 +17,10 @@
]
},
"editable": true,
+ "gnetId": null,
"hideControls": false,
"id": null,
"links": [],
- "originalTitle": "Elasticsearch",
"refresh": "1m",
"rows": [
{
@@ -51,6 +51,17 @@
"id": 59,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -58,6 +69,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -178,6 +196,17 @@
"id": 61,
"interval": ">60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -185,6 +214,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -487,6 +523,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -595,6 +632,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -651,6 +689,17 @@
"id": 32,
"interval": "> 60s",
"links": [],
+ "mappingType": 1,
+ "mappingTypes": [
+ {
+ "name": "value to text",
+ "value": 1
+ },
+ {
+ "name": "range to text",
+ "value": 2
+ }
+ ],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
@@ -658,6 +707,13 @@
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
+ "rangeMaps": [
+ {
+ "from": "null",
+ "text": "N/A",
+ "to": "null"
+ }
+ ],
"span": 2,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
@@ -824,6 +880,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -998,6 +1055,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "cumulative"
},
"type": "graph",
@@ -1172,6 +1230,7 @@
"tooltip": {
"msResolution": false,
"shared": true,
+ "sort": 0,
"value_type": "individual"
},
"type": "graph",
@@ -1194,323 +1253,6 @@
"show": true
}
]
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": null,
- "editable": true,
- "error": false,
- "format": "percent",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "id": 58,
- "interval": null,
- "links": [],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "span": 2,
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "targets": [
- {
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- }
- ],
- "measurement": "fs_space_percent_free",
- "policy": "default",
- "query": "SELECT mean(\"value\") FROM \"fs_space_percent_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" =~ /^$server$/ AND $timeFilter GROUP BY time($interval)",
- "rawQuery": false,
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": [
- {
- "key": "fs",
- "operator": "=",
- "value": "/opt/es/data"
- },
- {
- "condition": "AND",
- "key": "hostname",
- "operator": "=",
- "value": "$server"
- }
- ]
- }
- ],
- "thresholds": "",
- "title": "Free space on /opt/es/data",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "aliasColors": {},
- "bars": false,
- "datasource": null,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {
- "threshold1": null,
- "threshold1Color": "rgba(216, 200, 27, 0.27)",
- "threshold2": null,
- "threshold2Color": "rgba(234, 112, 112, 0.22)"
- },
- "id": 57,
- "interval": "> 60s",
- "legend": {
- "alignAsTable": false,
- "avg": false,
- "current": false,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "span": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "alias": "free",
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "0"
- ],
- "type": "fill"
- }
- ],
- "measurement": "fs_space_free",
- "policy": "default",
- "query": "SELECT mean(\"value\") FROM \"fs_space_free\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" =~ /^$server$/ AND $timeFilter GROUP BY time($interval) fill(0)",
- "rawQuery": false,
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": [
- {
- "key": "fs",
- "operator": "=",
- "value": "/opt/es/data"
- },
- {
- "condition": "AND",
- "key": "hostname",
- "operator": "=",
- "value": "$server"
- }
- ]
- },
- {
- "alias": "used",
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "0"
- ],
- "type": "fill"
- }
- ],
- "measurement": "fs_space_used",
- "policy": "default",
- "query": "SELECT mean(\"value\") FROM \"fs_space_used\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" =~ /^$server$/ AND $timeFilter GROUP BY time($interval) fill(0)",
- "rawQuery": false,
- "refId": "B",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": [
- {
- "key": "fs",
- "operator": "=",
- "value": "/opt/es/data"
- },
- {
- "condition": "AND",
- "key": "hostname",
- "operator": "=",
- "value": "$server"
- }
- ]
- },
- {
- "alias": "reserved",
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "auto"
- ],
- "type": "time"
- },
- {
- "params": [
- "0"
- ],
- "type": "fill"
- }
- ],
- "measurement": "fs_space_percent_reserved",
- "policy": "default",
- "query": "SELECT mean(\"value\") FROM \"fs_space_percent_reserved\" WHERE \"fs\" = '/opt/es/data' AND \"hostname\" =~ /^$server$/ AND $timeFilter GROUP BY time($interval) fill(0)",
- "rawQuery": false,
- "refId": "C",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": [
- {
- "key": "fs",
- "operator": "=",
- "value": "/opt/es/data"
- },
- {
- "condition": "AND",
- "key": "hostname",
- "operator": "=",
- "value": "$server"
- }
- ]
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Disk usage on /opt/es/data",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "show": true
- },
- "yaxes": [
- {
- "format": "bytes",
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "format": "short",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ]
}
],
"showTitle": true,
@@ -1591,5 +1333,5 @@
},
"timezone": "browser",
"title": "Elasticsearch",
- "version": 2
-}
+ "version": 3
+}
\ No newline at end of file
diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index e2d7871..36dd674 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -20,7 +20,15 @@
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
{%- load_yaml as client_defaults %}
-default:
+Debian:
+ pkgs:
+ - python-elasticsearch
+ server:
+ host: 127.0.0.1
+ port: 9200
+RedHat:
+ pkgs:
+ - python-elasticsearch
server:
host: 127.0.0.1
port: 9200