Merge pull request #380 from patsys/master

Add elasticsearch dashboard cluster filter

Author: frodenas

jobs/elasticsearch_dashboards/templates/elasticsearch.json

@@ -2824,19 +2824,65 @@
         "refresh": 2,
         "type": "interval"
       },
+      {
+        "allValue": ".*",
+	"current": {},
+	"datasource": "${DS_PROMETHEUS}",
+        "definition": "label_values(elasticsearch_cluster_health_number_of_nodes,cluster)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "cluster",
+        "multi": false,
+        "name": "cluster",
+        "options": [],
+        "query": "label_values(elasticsearch_cluster_health_number_of_nodes,cluster)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": null,
+	"current": {},
+	"datasource": "${DS_PROMETHEUS}",
+        "definition": "label_values(elasticsearch_cluster_health_number_of_nodes{cluster=~\"^$cluster$\"},instance)",
+        "hide": 2,
+        "includeAll": true,
+        "label": "cinstance",
+        "multi": true,
+        "name": "cinstance",
+        "options": [],
+        "query": "label_values(elasticsearch_cluster_health_number_of_nodes{cluster=~\"^$cluster$\"},instance)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
       {
         "allValue": null,
-        "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+	"current": {},
+	"datasource": "${DS_PROMETHEUS}",
+        "definition": "label_values(elasticsearch_cluster_health_up{instance=~\"^$cinstance$\"},instance)",
         "hide": 0,
         "includeAll": false,
         "label": "Instance",
         "multi": false,
         "name": "instance",
         "options": [],
-        "query": "label_values(elasticsearch_cluster_health_up,instance)",
+        "query": "label_values(elasticsearch_cluster_health_up{instance=~\"^$cinstance$\"},instance)",
         "refresh": 1,
         "regex": "",
+        "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": null,
         "tags": [],