Merge remote-tracking branch 'grafana/master' into more-panel-props

* grafana/master: Docs: minor docs update for old urls Chore: Add more explicit typing (grafana#16594) Chore: Lowered implicit anys limit to 5977 Chore: Adds typings to lodash (grafana#16590) PanelEditor: Change Queries heading to Query (grafana#16536) Security: Store datasource passwords encrypted in secureJsonData (grafana#16175) More development dashboards (grafana#16550) build: upgrades to golang 1.12.4 (grafana#16545) Use package libfontconfig1, instead of libfontconfig (grafana#16548) Adjust Send on all alerts to default label (grafana#16554) Chore: Lower limit of implicit anys to 6676
ryantxu · Apr 15, 2019 · 5722714 · 5722714
2 parents 205db96 + d4bb92a
commit 5722714
Show file tree

Hide file tree

Showing 162 changed files with 4,960 additions and 1,011 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,7 +19,7 @@ version: 2
 jobs:
   mysql-integration-test:
     docker:
-      - image: circleci/golang:1.11.5
+      - image: circleci/golang:1.12.4
       - image: circleci/mysql:5.6-ram
         environment:
           MYSQL_ROOT_PASSWORD: rootpass
@@ -39,7 +39,7 @@ jobs:
 
   postgres-integration-test:
     docker:
-      - image: circleci/golang:1.11.5
+      - image: circleci/golang:1.12.4
       - image: circleci/postgres:9.3-ram
         environment:
           POSTGRES_USER: grafanatest
@@ -58,7 +58,7 @@ jobs:
 
   cache-server-test:
     docker:
-      - image: circleci/golang:1.11.5
+      - image: circleci/golang:1.12.4
       - image: circleci/redis:4-alpine
       - image: memcached
     working_directory: /go/src/github.com/grafana/grafana
@@ -88,7 +88,7 @@ jobs:
 
   backend-lint:
     docker:
-      - image: circleci/golang:1.11.5
+      - image: circleci/golang:1.12.4
         environment:
           # we need CGO because of go-sqlite3
           CGO_ENABLED: 1
@@ -120,7 +120,7 @@ jobs:
 
   test-backend:
     docker:
-      - image: circleci/golang:1.11.5
+      - image: circleci/golang:1.12.4
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -130,7 +130,7 @@ jobs:
 
   build-all:
     docker:
-     - image: grafana/build-container:1.2.4
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -174,7 +174,7 @@ jobs:
 
   build:
     docker:
-     - image: grafana/build-container:1.2.4
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -243,7 +243,7 @@ jobs:
 
   build-enterprise:
     docker:
-     - image: grafana/build-container:1.2.4
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -275,7 +275,7 @@ jobs:
 
   build-all-enterprise:
     docker:
-    - image: grafana/build-container:1.2.4
+    - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
     - checkout

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Golang build container
-FROM golang:1.11.5
+FROM golang:1.12.4
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
@@ -53,7 +53,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
 WORKDIR $GF_PATHS_HOME
 
 RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -qq -y libfontconfig ca-certificates && \
+    apt-get install -qq -y libfontconfig1 ca-certificates && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/build.go b/build.go
@@ -270,7 +270,7 @@ func createDebPackages() {
 		defaultFileSrc: "packaging/deb/default/grafana-server",
 		systemdFileSrc: "packaging/deb/systemd/grafana-server.service",
 
-		depends: []string{"adduser", "libfontconfig"},
+		depends: []string{"adduser", "libfontconfig1"},
 	})
 }
 

diff --git a/devenv/dashboards.yaml b/devenv/dashboards.yaml
@@ -4,6 +4,6 @@ providers:
  - name: 'gdev dashboards'
    folder: 'gdev dashboards'
    type: file
-   updateIntervalSeconds: 15
+   updateIntervalSeconds: 60
    options:
      path: devenv/dev-dashboards
diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
@@ -22,10 +22,11 @@ datasources:
     access: proxy
     database: site
     user: grafana
-    password: grafana
     url: http://localhost:8086
     jsonData:
       timeInterval: "15s"
+    secureJsonData:
+      password: grafana
 
   - name: gdev-opentsdb
     type: opentsdb
@@ -110,14 +111,16 @@ datasources:
     url: localhost:3306
     database: grafana
     user: grafana
-    password: password
+    secureJsonData:
+      password: password
 
   - name: gdev-mysql-ds-tests
     type: mysql
     url: localhost:3306
     database: grafana_ds_tests
     user: grafana
-    password: password
+    secureJsonData:
+      password: password
 
   - name: gdev-mssql
     type: mssql

diff --git a/devenv/dev-dashboards/testdata_alerts.json → ...-dashboards/alerting/testdata_alerts.json b/devenv/dev-dashboards/testdata_alerts.json → ...-dashboards/alerting/testdata_alerts.json
@@ -22,17 +22,11 @@
         "conditions": [
           {
             "evaluator": {
-              "params": [
-                60
-              ],
+              "params": [60],
               "type": "gt"
             },
             "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
+              "params": ["A", "5m", "now"]
             },
             "reducer": {
               "params": [],
@@ -149,17 +143,11 @@
         "conditions": [
           {
             "evaluator": {
-              "params": [
-                177
-              ],
+              "params": [177],
               "type": "gt"
             },
             "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
+              "params": ["A", "5m", "now"]
             },
             "reducer": {
               "params": [],
@@ -278,20 +266,14 @@
         "conditions": [
           {
             "evaluator": {
-              "params": [
-                1
-              ],
+              "params": [1],
               "type": "gt"
             },
             "operator": {
               "type": "and"
             },
             "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
+              "params": ["A", "15m", "now"]
             },
             "reducer": {
               "params": [],
@@ -409,20 +391,14 @@
         "conditions": [
           {
             "evaluator": {
-              "params": [
-                177
-              ],
+              "params": [177],
               "type": "gt"
             },
             "operator": {
               "type": "and"
             },
             "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
+              "params": ["A", "15m", "now"]
             },
             "reducer": {
               "params": [],
@@ -540,20 +516,14 @@
         "conditions": [
           {
             "evaluator": {
-              "params": [
-                100
-              ],
+              "params": [100],
               "type": "gt"
             },
             "operator": {
               "type": "and"
             },
             "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
+              "params": ["A", "5m", "now"]
             },
             "reducer": {
               "params": [],
@@ -670,9 +640,7 @@
   "revision": 2,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": [
-    "grafana-test"
-  ],
+  "tags": ["gdev", "alerting"],
   "templating": {
     "list": []
   },
@@ -681,32 +649,11 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
   },
   "timezone": "browser",
   "title": "Alerting with TestData",
   "uid": "7MeksYbmk",
   "version": 7
-}
+}
diff --git a/...tasource_tests_elasticsearch_compare.json → ...-elasticsearch/elasticsearch_compare.json b/...tasource_tests_elasticsearch_compare.json → ...-elasticsearch/elasticsearch_compare.json
@@ -21,10 +21,7 @@
   "links": [
     {
       "icon": "external link",
-      "tags": [
-        "gdev",
-        "elasticsearch"
-      ],
+      "tags": ["gdev", "elasticsearch", "datasource-test"],
       "type": "dashboards"
     }
   ],
@@ -1824,13 +1821,7 @@
                   "id": "1",
                   "meta": {},
                   "settings": {
-                    "percents": [
-                      25,
-                      50,
-                      75,
-                      95,
-                      99
-                    ]
+                    "percents": [25, 50, 75, 95, 99]
                   },
                   "type": "percentiles"
                 }
@@ -1941,13 +1932,7 @@
                   "meta": {},
                   "settings": {
                     "missing": null,
-                    "percents": [
-                      25,
-                      50,
-                      75,
-                      95,
-                      99
-                    ]
+                    "percents": [25, 50, 75, 95, 99]
                   },
                   "type": "percentiles"
                 }
@@ -5858,10 +5843,7 @@
   "refresh": false,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": [
-    "gdev",
-    "elasticsearch"
-  ],
+  "tags": ["gdev", "elasticsearch"],
   "templating": {
     "list": [
       {
@@ -5901,32 +5883,11 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
   },
   "timezone": "",
   "title": "Datasource tests - Elasticsearch comparison",
   "uid": "fuFWehBmk",
   "version": 4
-}
+}