From 6a19c05248c44bf51427d5807dcf24609e3123dd Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 29 Jan 2020 18:04:26 +0100
Subject: [PATCH 1/3] jsonnet: add general rules for up/down targets

---
 .../kube-prometheus/rules/general.libsonnet   | 19 +++++++++++++++++++
 jsonnet/kube-prometheus/rules/rules.libsonnet |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 jsonnet/kube-prometheus/rules/general.libsonnet

diff --git a/jsonnet/kube-prometheus/rules/general.libsonnet b/jsonnet/kube-prometheus/rules/general.libsonnet
new file mode 100644
index 00000000..231d5cb5
--- /dev/null
+++ b/jsonnet/kube-prometheus/rules/general.libsonnet
@@ -0,0 +1,19 @@
+{
+  prometheusRules+:: {
+    groups+: [
+      {
+        name: 'kube-prometheus-general.rules',
+        rules: [
+          {
+            expr: 'count without(instance, pod, node) (up == 1)',
+            record: 'count:up1',
+          },
+          {
+            expr: 'count without(instance, pod, node) (up == 0)',
+            record: 'count:up0',
+          },
+        ],
+      },
+    ],
+  },
+}
diff --git a/jsonnet/kube-prometheus/rules/rules.libsonnet b/jsonnet/kube-prometheus/rules/rules.libsonnet
index b0217aba..79a5c0ab 100644
--- a/jsonnet/kube-prometheus/rules/rules.libsonnet
+++ b/jsonnet/kube-prometheus/rules/rules.libsonnet
@@ -1 +1,2 @@
-(import 'node-rules.libsonnet')
+(import 'node-rules.libsonnet') +
+(import 'general.libsonnet')

From d1b81cc1acc3db55556503b3567c9de9e0496ac5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 19 Feb 2020 09:15:04 +0100
Subject: [PATCH 2/3] manifests: regenerate

---
 manifests/prometheus-rules.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 93334a9e..f9609d61 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -251,6 +251,12 @@ spec:
     - expr: cluster:node_cpu_seconds_total:rate5m / count(sum(node_cpu_seconds_total)
         BY (instance, cpu))
       record: cluster:node_cpu:ratio
+  - name: kube-prometheus-general.rules
+    rules:
+    - expr: count without(instance, pod, node) (up == 1)
+      record: count:up1
+    - expr: count without(instance, pod, node) (up == 0)
+      record: count:up0
   - name: node-exporter
     rules:
     - alert: NodeFilesystemSpaceFillingUp

From 8fd8248928f0f33d2ea079198ccf92be0a2d7ac7 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 20 Feb 2020 09:04:19 +0100
Subject: [PATCH 3/3] Makefile: pin jsonnet-ci to 0.36

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 994fa5ae..81d8f5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ CONTAINER_CMD:=docker run --rm \
 		-v "$(shell go env GOCACHE):/.cache/go-build" \
 		-v "$(PWD):/go/src/github.com/coreos/kube-prometheus:Z" \
 		-w "/go/src/github.com/coreos/kube-prometheus" \
-		quay.io/coreos/jsonnet-ci
+		quay.io/coreos/jsonnet-ci:release-0.36
 
 all: generate fmt test