Merge remote-tracking branch 'grafana/master' into min-max-field

* grafana/master: Streaming: support streaming and a javascript test datasource (grafana#16729) GraphLegendEditor: use stats picker rather than switches (grafana#16759) Feature: add cron setting for the ldap settings (grafana#16673) Build: Disables gosec until identified performance problems (grafana#16764) Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761) elasticsearch: add 7.x version support (grafana#16646) Provisioning: Add API endpoint to reload provisioning configs (grafana#16579) Config: Show user-friendly error message instead of stack trace (grafana#16564) Chore: Lowered implicit anys limit to 5954 Feature: Enable React based options editors for Datasource plugins (grafana#16748) sqlstore: use column name in order by (grafana#16583) user friendly guide (grafana#16743) Provisioning: Interpolate env vars in provisioning files (grafana#16499) admin: add more stats about roles (grafana#16667) Feature: Migrate Legend components to grafana/ui (grafana#16468) playlist: fix loading dashboards by tag (grafana#16727) CloudWatch: Use default alias if there is no alias for metrics (grafana#16732) Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu · Apr 25, 2019 · 5b2305a · 5b2305a
2 parents 3690b27 + 470634e
commit 5b2305a
Show file tree

Hide file tree

Showing 125 changed files with 12,871 additions and 768 deletions.
diff --git a/conf/defaults.ini b/conf/defaults.ini
@@ -363,6 +363,9 @@ enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
 
+# LDAP backround sync (Enterprise only)
+sync_cron = @hourly
+
 #################################### SMTP / Emailing #####################
 [smtp]
 enabled = false

diff --git a/conf/provisioning/dashboards/sample.yaml b/conf/provisioning/dashboards/sample.yaml
@@ -5,6 +5,7 @@ apiVersion: 1
 # - name: 'default'
 #   orgId: 1
 #   folder: ''
+#   folderUid: ''
 #   type: file
 #   options:
 #     path: /var/lib/grafana/dashboards
diff --git a/devenv/dashboards.yaml b/devenv/dashboards.yaml
@@ -3,6 +3,7 @@ apiVersion: 1
 providers:
  - name: 'gdev dashboards'
    folder: 'gdev dashboards'
+   folderUid: ''
    type: file
    updateIntervalSeconds: 60
    options:

diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
@@ -99,13 +99,44 @@ datasources:
   - name: gdev-elasticsearch-v6-filebeat
     type: elasticsearch
     access: proxy
-    database: "[filebeat-6.2.4-]YYYY.MM.DD"
+    database: "[filebeat-]YYYY.MM.DD"
     url: http://localhost:11200
     jsonData:
       interval: Daily
       timeField: "@timestamp"
       esVersion: 60
 
+  - name: gdev-elasticsearch-v7-metrics
+    type: elasticsearch
+    access: proxy
+    database: "[metrics-]YYYY.MM.DD"
+    url: http://localhost:12200
+    jsonData:
+      timeInterval: 10s
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+
+  - name: gdev-elasticsearch-v7-logs
+    type: elasticsearch
+    access: proxy
+    database: "[logs-]YYYY.MM.DD"
+    url: http://localhost:12200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+
+  - name: gdev-elasticsearch-v7-filebeat
+    type: elasticsearch
+    access: proxy
+    database: "[filebeat-]YYYY.MM.DD"
+    url: http://localhost:12200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+
   - name: gdev-mysql
     type: mysql
     url: localhost:3306

diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json
@@ -17,11 +17,13 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1545263815779,
+  "iteration": 1555595032099,
   "links": [
     {
+      "asDropdown": true,
       "icon": "external link",
       "tags": ["gdev", "elasticsearch", "datasource-test"],
+      "title": "Dashboards",
       "type": "dashboards"
     }
   ],
@@ -5841,9 +5843,9 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 16,
+  "schemaVersion": 18,
   "style": "dark",
-  "tags": ["gdev", "elasticsearch"],
+  "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
     "list": [
       {
@@ -5852,7 +5854,9 @@
           "value": "gdev-elasticsearch-v5-metrics"
         },
         "hide": 0,
+        "includeAll": false,
         "label": "Version One",
+        "multi": false,
         "name": "version_one",
         "options": [],
         "query": "elasticsearch",
@@ -5867,7 +5871,9 @@
           "value": "gdev-elasticsearch-v6-metrics"
         },
         "hide": 0,
+        "includeAll": false,
         "label": "Version Two",
+        "multi": false,
         "name": "version_two",
         "options": [],
         "query": "elasticsearch",
@@ -5889,5 +5895,5 @@
   "timezone": "",
   "title": "Datasource tests - Elasticsearch comparison",
   "uid": "fuFWehBmk",
-  "version": 4
+  "version": 2
 }
diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json
@@ -31,8 +31,10 @@
   "iteration": 1554310942895,
   "links": [
     {
+      "asDropdown": true,
       "icon": "external link",
-      "tags": ["gdev", "elasticsearch"],
+      "tags": ["gdev", "elasticsearch", "datasource-test"],
+      "title": "Dashboards",
       "type": "dashboards"
     }
   ],

diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json
@@ -31,10 +31,10 @@
   "iteration": 1554310560048,
   "links": [
     {
-      "asDropdown": false,
+      "asDropdown": true,
       "icon": "external link",
-      "tags": ["gdev", "elasticsearch"],
-      "title": "Dashboard",
+      "tags": ["gdev", "elasticsearch", "datasource-test"],
+      "title": "Dashboards",
       "type": "dashboards"
     }
   ],

diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json
@@ -31,8 +31,10 @@
   "iteration": 1554310839317,
   "links": [
     {
+      "asDropdown": true,
       "icon": "external link",
-      "tags": ["gdev", "elasticsearch"],
+      "tags": ["gdev", "elasticsearch", "datasource-test"],
+      "title": "Dashboards",
       "type": "dashboards"
     }
   ],

diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json
@@ -16,7 +16,15 @@
   "gnetId": null,
   "graphTooltip": 0,
   "iteration": 1554902936982,
-  "links": [],
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "tags": ["gdev", "elasticsearch", "datasource-test"],
+      "title": "Dashboards",
+      "type": "dashboards"
+    }
+  ],
   "panels": [
     {
       "aliasColors": {