From 6f6fd65a48fd3659f89eee2778a33941c3a867d7 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 27 Nov 2019 15:09:04 +0100
Subject: [PATCH 1/3] jsonnet/kube-prometheus/node-exporter: follow
 node-exporter best practices and scrape data every 15s

---
 jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 06a7397f..58fc06c1 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -168,7 +168,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
             {
               port: 'https',
               scheme: 'https',
-              interval: '30s',
+              interval: '15s',
               bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
               relabelings: [
                 {

From 50b06b0d335f66fc2350396a53f6db76731d72e0 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 27 Nov 2019 15:11:06 +0100
Subject: [PATCH 2/3] manifests: regenerate

---
 jsonnetfile.lock.json                       | 2 +-
 manifests/node-exporter-serviceMonitor.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index d97e7f93..6cbd0aae 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -26,7 +26,7 @@
       "name": "grafana-builder",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/kausalco/public",
           "subdir": "grafana-builder"
         }
       },
diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml
index 590c875a..3ceed6c9 100644
--- a/manifests/node-exporter-serviceMonitor.yaml
+++ b/manifests/node-exporter-serviceMonitor.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
+    interval: 15s
     port: https
     relabelings:
     - action: replace

From 56027ac7570025b13186539122f7767d797470a9 Mon Sep 17 00:00:00 2001
From: yeya24 <yb532204897@gmail.com>
Date: Sun, 1 Dec 2019 09:33:11 -0500
Subject: [PATCH 3/3] update apiversion

Signed-off-by: yeya24 <yb532204897@gmail.com>
---
 examples/example-app/example-app.yaml                     | 6 +++++-
 .../metrics-server/metrics-server-cluster-role.yaml       | 8 ++++++++
 .../metrics-server/metrics-server-deployment.yaml         | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/examples/example-app/example-app.yaml b/examples/example-app/example-app.yaml
index 708e8afa..69a2ab7e 100644
--- a/examples/example-app/example-app.yaml
+++ b/examples/example-app/example-app.yaml
@@ -14,12 +14,16 @@ spec:
     port: 8080
     targetPort: web
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: example-app
   namespace: default
 spec:
+  selector:
+    matchLabels:
+      app: example-app
+      version: 1.1.3
   replicas: 4
   template:
     metadata:
diff --git a/experimental/metrics-server/metrics-server-cluster-role.yaml b/experimental/metrics-server/metrics-server-cluster-role.yaml
index 38844d9a..f34ea8fd 100644
--- a/experimental/metrics-server/metrics-server-cluster-role.yaml
+++ b/experimental/metrics-server/metrics-server-cluster-role.yaml
@@ -14,6 +14,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - "apps"
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - "extensions"
   resources:
diff --git a/experimental/metrics-server/metrics-server-deployment.yaml b/experimental/metrics-server/metrics-server-deployment.yaml
index 386740da..0dbd2b2c 100644
--- a/experimental/metrics-server/metrics-server-deployment.yaml
+++ b/experimental/metrics-server/metrics-server-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: metrics-server