From 65e57d8ec7ce45495bd00ba3727a770f9cb9f6f9 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Wed, 6 Nov 2019 07:06:18 +0100 Subject: [PATCH 1/2] Adapt to new jb version --- jsonnetfile.json | 10 ---------- jsonnetfile.lock.json | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/jsonnetfile.json b/jsonnetfile.json index 561224c271..ad5fe5bcde 100644 --- a/jsonnetfile.json +++ b/jsonnetfile.json @@ -8,16 +8,6 @@ } }, "version": "" - }, - { - "name": "node-mixin", - "source": { - "git": { - "remote": "https://github.com/prometheus/node_exporter", - "subdir": "docs/node-mixin" - } - }, - "version": "5a7b85876d6108a91f0d8673c0d7eca38687671b" } ] } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 3ce78152a8..d97e7f93b5 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -41,8 +41,8 @@ "subdir": "grafonnet" } }, - "version": "47db72da03fc4a7a0658a87791e13c3315a3a252", - "sum": "ssLOSIiYWYBvEYJHwRtwMY4kPQoP+MuIUkT0bp2Mb6A=" + "version": "b82411476842f583817e67feff5becf1228fd540", + "sum": "mEosZ6hZCTCw8AaASEtRFjY8PSmpvqI3xj6IWpwcroU=" }, { "name": "ksonnet", @@ -94,7 +94,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "e94503ff5c412590ce7616accdd3c62a2189bcd3", + "version": "431844f0a7c289e4255a68f09a18fcca09637fb2", "sum": "wSDLAXS5Xzla9RFRE2IW5mRToeRFULHb7dSYYBDfEsM=" }, { From 3b82c11944ab3a66bd5c86dbbc8407ade692d83b Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Wed, 6 Nov 2019 07:09:00 +0100 Subject: [PATCH 2/2] manifests: Re-generate with latest deps --- manifests/grafana-dashboardDefinitions.yaml | 56 ++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 1ac6ae6621..5cfa21f51f 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -1508,7 +1508,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Time", + "pattern": "", "thresholds": [ ], @@ -1526,7 +1526,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #A", + "pattern": "", "thresholds": [ ], @@ -1544,7 +1544,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #B", + "pattern": "", "thresholds": [ ], @@ -1562,7 +1562,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #C", + "pattern": "", "thresholds": [ ], @@ -1580,7 +1580,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #D", + "pattern": "", "thresholds": [ ], @@ -1598,7 +1598,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #E", + "pattern": "", "thresholds": [ ], @@ -1616,7 +1616,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #F", + "pattern": "", "thresholds": [ ], @@ -1634,7 +1634,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #G", + "pattern": "", "thresholds": [ ], @@ -1652,7 +1652,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #H", + "pattern": "", "thresholds": [ ], @@ -1670,7 +1670,7 @@ items: "link": true, "linkTooltip": "Drill down", "linkUrl": "d/8b7a8b326d7a6f1f04244066368c67af/kubernetes-networking-namespace-pods?orgId=1&refresh=30s&var-namespace=$__cell", - "pattern": "namespace", + "pattern": "", "thresholds": [ ], @@ -17779,7 +17779,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Time", + "pattern": "", "thresholds": [ ], @@ -17797,7 +17797,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #A", + "pattern": "", "thresholds": [ ], @@ -17815,7 +17815,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #B", + "pattern": "", "thresholds": [ ], @@ -17833,7 +17833,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #C", + "pattern": "", "thresholds": [ ], @@ -17851,7 +17851,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #D", + "pattern": "", "thresholds": [ ], @@ -17869,7 +17869,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #E", + "pattern": "", "thresholds": [ ], @@ -17887,7 +17887,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #F", + "pattern": "", "thresholds": [ ], @@ -17905,7 +17905,7 @@ items: "link": true, "linkTooltip": "Drill down", "linkUrl": "d/7a18067ce943a40ae25454675c19ff5c/kubernetes-networking-pod?orgId=1&refresh=30s&var-namespace=$namespace&var-pod=$__cell", - "pattern": "pod", + "pattern": "", "thresholds": [ ], @@ -19012,7 +19012,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Time", + "pattern": "", "thresholds": [ ], @@ -19030,7 +19030,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #A", + "pattern": "", "thresholds": [ ], @@ -19048,7 +19048,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #B", + "pattern": "", "thresholds": [ ], @@ -19066,7 +19066,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #C", + "pattern": "", "thresholds": [ ], @@ -19084,7 +19084,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #D", + "pattern": "", "thresholds": [ ], @@ -19102,7 +19102,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #E", + "pattern": "", "thresholds": [ ], @@ -19120,7 +19120,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #F", + "pattern": "", "thresholds": [ ], @@ -19138,7 +19138,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #G", + "pattern": "", "thresholds": [ ], @@ -19156,7 +19156,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #H", + "pattern": "", "thresholds": [ ], @@ -19174,7 +19174,7 @@ items: "link": true, "linkTooltip": "Drill down", "linkUrl": "d/728bf77cc1166d2f3133bf25846876cc/kubernetes-networking-workload?orgId=1&refresh=30s&var-namespace=$namespace&var-type=$type&var-workload=$__cell", - "pattern": "workload", + "pattern": "", "thresholds": [ ],