squash merge from dev branch

2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions
--- a/vendor/github.com/prometheus/common/expfmt/testdata/json2
+++ b/vendor/github.com/prometheus/common/expfmt/testdata/json2
@@ -0,0 +1,46 @@
+[
+  {
+    "baseLabels": {
+      "__name__": "rpc_calls_total",
+      "job": "batch_job"
+    },
+    "docstring": "RPC calls.",
+    "metric": {
+      "type": "counter",
+      "value": [
+        {
+          "labels": {
+            "service": "zed"
+          },
+          "value": 25
+        },
+        {
+          "labels": {
+            "service": "bar"
+          },
+          "value": 24
+        }
+      ]
+    }
+  },
+  {
+    "baseLabels": {
+      "__name__": "rpc_latency_microseconds"
+    },
+    "docstring": "RPC latency.",
+    "metric": {
+      "type": "histogram",
+      "value": [
+        {
+          "labels": {
+            "service": "foo"
+          },
+          "value": {
+            "0.010000": 15,
+            "0.990000": 17
+          }
+        }
+      ]
+    }
+  }
+]