Browse Source

testdata(): added test graph for null stacking scenario, #6566

Torkel Ödegaard 9 years ago
parent
commit
42167a65c6

+ 234 - 51
public/app/plugins/app/testdata/dashboards/graph_last_1h.json

@@ -1,5 +1,5 @@
 {
-  "revision": 5,
+  "revision": 6,
   "title": "TestData - Graph Panel Last 1h",
   "tags": [
     "grafana-test"
@@ -7,8 +7,48 @@
   "style": "dark",
   "timezone": "browser",
   "editable": true,
-  "hideControls": false,
   "sharedCrosshair": false,
+  "hideControls": false,
+  "time": {
+    "from": "2016-11-16T16:59:38.294Z",
+    "to": "2016-11-16T17:09:01.532Z"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "templating": {
+    "list": []
+  },
+  "annotations": {
+    "list": []
+  },
+  "refresh": false,
+  "schemaVersion": 13,
+  "version": 4,
+  "links": [],
+  "gnetId": null,
   "rows": [
     {
       "collapse": false,
@@ -238,7 +278,13 @@
           ]
         }
       ],
-      "title": "New row"
+      "title": "New row",
+      "showTitle": false,
+      "titleSize": "h6",
+      "isNew": false,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null
     },
     {
       "collapse": false,
@@ -332,7 +378,13 @@
           "type": "text"
         }
       ],
-      "title": "New row"
+      "title": "New row",
+      "showTitle": false,
+      "titleSize": "h6",
+      "isNew": false,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null
     },
     {
       "collapse": false,
@@ -371,7 +423,7 @@
               "yaxis": 2
             }
           ],
-          "span": 7.99561403508772,
+          "span": 8,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -432,12 +484,18 @@
           "isNew": true,
           "links": [],
           "mode": "markdown",
-          "span": 4.00438596491228,
+          "span": 4,
           "title": "",
           "type": "text"
         }
       ],
-      "title": "New row"
+      "title": "New row",
+      "showTitle": false,
+      "titleSize": "h6",
+      "isNew": false,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null
     },
     {
       "collapse": false,
@@ -545,7 +603,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 3,
+          "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -592,6 +650,31 @@
             }
           ]
         },
+        {
+          "content": "Should be a long line connecting the null region in the `connected`  mode, and in zero it should just be a line with zero value at the null points. ",
+          "editable": true,
+          "error": false,
+          "id": 13,
+          "isNew": true,
+          "links": [],
+          "mode": "markdown",
+          "span": 4,
+          "title": "",
+          "type": "text"
+        }
+      ],
+      "title": "New row",
+      "showTitle": false,
+      "titleSize": "h6",
+      "isNew": false,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null
+    },
+    {
+      "isNew": false,
+      "title": "Dashboard Row",
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
@@ -624,7 +707,7 @@
               "zindex": -3
             }
           ],
-          "span": 5,
+          "span": 8,
           "stack": true,
           "steppedLine": false,
           "targets": [
@@ -687,49 +770,149 @@
               "show": true
             }
           ]
+        },
+        {
+          "content": "Stacking values on top of nulls, should treat the null values as zero. ",
+          "editable": true,
+          "error": false,
+          "id": 14,
+          "isNew": true,
+          "links": [],
+          "mode": "markdown",
+          "span": 4,
+          "title": "",
+          "type": "text"
         }
       ],
-      "title": "New row"
+      "showTitle": false,
+      "titleSize": "h6",
+      "height": 250,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null,
+      "collapse": false
+    },
+    {
+      "isNew": false,
+      "title": "Dashboard Row",
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "datasource": "Grafana TestData",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "id": 12,
+          "isNew": true,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [
+            {
+              "alias": "B-series",
+              "zindex": -3
+            }
+          ],
+          "span": 8,
+          "stack": true,
+          "steppedLine": false,
+          "targets": [
+            {
+              "hide": false,
+              "refId": "B",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "1,20,40,null,null,null,null,null,null,100,10,10,20,30,40,10",
+              "target": "",
+              "alias": ""
+            },
+            {
+              "alias": "",
+              "hide": false,
+              "refId": "A",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "1,20,40,null,null,null,null,null,null,100,10,10,20,30,40,10",
+              "target": ""
+            },
+            {
+              "alias": "",
+              "hide": false,
+              "refId": "C",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "1,20,40,null,null,null,null,null,null,100,10,10,20,30,40,10",
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Stacking all series null segment",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        },
+        {
+          "content": "Stacking when all values are null should leave a gap in the graph",
+          "editable": true,
+          "error": false,
+          "id": 15,
+          "isNew": true,
+          "links": [],
+          "mode": "markdown",
+          "span": 4,
+          "title": "",
+          "type": "text"
+        }
+      ],
+      "showTitle": false,
+      "titleSize": "h6",
+      "height": 250,
+      "repeat": null,
+      "repeatRowId": null,
+      "repeatIteration": null,
+      "collapse": false
     }
-  ],
-  "time": {
-    "from": "now-1h",
-    "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"
-    ]
-  },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 13,
-  "version": 13,
-  "links": [],
-  "gnetId": null
+  ]
 }

+ 1 - 1
public/app/plugins/app/testdata/plugin.json

@@ -9,7 +9,7 @@
       "name": "Grafana Project",
       "url": "http://grafana.org"
     },
-    "version": "1.0.14",
+    "version": "1.0.15",
     "updated": "2016-09-26"
   },