Merge remote-tracking branch 'grafana/master' into field-thresholds

* grafana/master: chore: remove x character in explore Dashboard: show refresh button in kiosk mode (grafana#17032) Devenv: Updated gauge test dashboard Chore: reintroduce gosec (grafana#17021) Gauge: tweaks to background color and height usage (grafana#17019) Feature: provide multildap server configuration (grafana#16914) (feat/explore): Support for new LogQL filtering syntax (grafana#16674) fix(explore): Prevent double querying for Prometheus and Loki (grafana#17004) Chore: No implict any fixes (grafana#17020) move log package to /infra (grafana#17023) Chore: Lowered implicit anys limit to 5386 Chore: Updated snapshot Select: Fixed isOpen issue Chore: Typescript no-implicit any fixes progress (grafana#17018) GraphPanel: show results for all SeriesData (grafana#16966) Fix: Wrap value of multi variable in array when coming from URL (grafana#16992)
ryantxu · May 13, 2019 · 9ec4f21 · 9ec4f21
2 parents ff25761 + 01a7c1f
commit 9ec4f21
Show file tree

Hide file tree

Showing 256 changed files with 1,717 additions and 1,002 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -35,6 +35,8 @@ RUN ./node_modules/.bin/grunt build
 # Final container
 FROM debian:stretch-slim
 
+LABEL maintainer="Grafana team <hello@grafana.com>"
+
 ARG GF_UID="472"
 ARG GF_GID="472"
 

diff --git a/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json b/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json
@@ -21,79 +21,62 @@
       "datasource": "gdev-testdata",
       "gridPos": {
         "h": 8,
-        "w": 24,
+        "w": 20,
         "x": 0,
         "y": 0
       },
       "id": 6,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": 100,
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": 0,
+            "max": 100,
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            },
+            {
+              "color": "#6ED0E0",
+              "index": 2,
+              "value": 75
+            },
+            {
+              "color": "#EF843C",
+              "index": 3,
+              "value": 87.5
+            },
+            {
+              "color": "#E24D42",
+              "index": 4,
+              "value": 93.75
+            },
+            {
+              "color": "#1F78C1",
+              "index": 5,
+              "value": 96.875
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "avg",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#1F78C1",
-            "index": 5,
-            "value": 96.875
-          },
-          {
-            "color": "#E24D42",
-            "index": 4,
-            "value": 93.75
-          },
-          {
-            "color": "#EF843C",
-            "index": 3,
-            "value": 87.5
-          },
-          {
-            "color": "#6ED0E0",
-            "index": 2,
-            "value": 75
-          },
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": [
-          {
-            "from": "50",
-            "id": 1,
-            "operator": "",
-            "text": "Hello :) ",
-            "to": "90",
-            "type": 2,
-            "value": ""
-          }
-        ]
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -124,50 +107,48 @@
     {
       "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 8
+        "h": 28,
+        "w": 4,
+        "x": 20,
+        "y": 0
       },
-      "id": 2,
+      "id": 4,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": 100,
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["max"],
+          "defaults": {
+            "decimals": 0,
+            "max": "200",
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            },
+            {
+              "color": "#6ED0E0",
+              "index": 2,
+              "value": 75
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "avg",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": []
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -192,61 +173,49 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Repeat horizontal",
+      "title": "Vertical",
       "type": "gauge"
     },
     {
       "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 14,
-        "w": 5,
+        "h": 20,
+        "w": 20,
         "x": 0,
-        "y": 16
+        "y": 8
       },
-      "id": 4,
+      "id": 2,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": "200",
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": 0,
+            "max": 100,
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "max",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#6ED0E0",
-            "index": 2,
-            "value": 75
-          },
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": []
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -271,11 +240,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Vertical",
+      "title": "Repeat horizontal",
       "type": "gauge"
     }
   ],
-  "schemaVersion": 17,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["panel-tests", "gdev", "gauge"],
   "templating": {
@@ -292,5 +261,5 @@
   "timezone": "",
   "title": "Panel Tests - Gauge Multi Series",
   "uid": "szkuR1umk",
-  "version": 7
+  "version": 2
 }
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/Dockerfile
@@ -0,0 +1,30 @@
+# Fork of https://github.com/dinkel/docker-openldap
+
+FROM debian:jessie
+
+LABEL maintainer="Grafana team <hello@grafana.com>"
+
+ENV OPENLDAP_VERSION 2.4.40
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        slapd=${OPENLDAP_VERSION}* \
+        ldap-utils && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mv /etc/ldap /etc/ldap.dist
+
+EXPOSE 389
+
+VOLUME ["/etc/ldap", "/var/lib/ldap"]
+
+COPY modules/ /etc/ldap.dist/modules
+COPY prepopulate/ /etc/ldap.dist/prepopulate
+
+COPY ../entrypoint.sh /entrypoint.sh
+COPY ../prepopulate.sh /prepopulate.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]