From b4d6ff04666a76375321db6aebfb94a457051bb3 Mon Sep 17 00:00:00 2001
From: Carlos de Paula <me@carlosedp.com>
Date: Thu, 14 Nov 2019 12:25:16 -0300
Subject: [PATCH] Fix endpoint names

---
 Readme.md             | 8 ++------
 k3s-overrides.jsonnet | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Readme.md b/Readme.md
index f675705..033ac70 100644
--- a/Readme.md
+++ b/Readme.md
@@ -69,11 +69,9 @@ wget https://github.com/rancher/k3s/releases/download/`curl -s https://api.githu
 sudo mv k3s /usr/local/bin
 
 # Start K3s
-sudo k3s server --docker &
+sudo k3s server &
 ```
 
-To generate the metrics with all metadata required by the dashboards, K3s needs to be started with Docker as the runtime.
-
 Now to deploy the monitoring stack on your K3s cluster, there are three parameters to be configured on `vars.jsonnet`:
 
 1. Set `k3s.enabled` to `true`.
@@ -89,9 +87,7 @@ To list the created ingresses, run `k3s kubectl get ingress --all-namespaces`.
 
 * Grafana on [https://grafana.[your_node_ip].nip.io](https://grafana.[your_node_ip].nip.io), 
 * Prometheus on [https://prometheus.[your_node_ip].nip.io](https://prometheus.[your_node_ip].nip.io) 
-* Alertmanager on [https://alertmanager.[your_node_ip].nip.io](https://alertmanager.[your_node_ip].nip.io)
-
-There are some dashboards that shows no values due to some cadvisor metrics not having the complete metadata if K3s is started with default script or no `--docker` arg. Check the open issues for more information.
+* Alertmanager on [https://alertmanager.[your_node_ip].nip.io](https://alertmanager.[your_node_ip].nip.io) 
 
 ## Updating the ingress suffixes
 
diff --git a/k3s-overrides.jsonnet b/k3s-overrides.jsonnet
index d8ad728..9b5515e 100644
--- a/k3s-overrides.jsonnet
+++ b/k3s-overrides.jsonnet
@@ -5,10 +5,10 @@ local utils = import 'utils.libsonnet';
 {
   prometheus+:: {
     kubeControllerManagerPrometheusDiscoveryEndpoints:
-      utils.newEndpoint('kube-controller-manager', 'kube-system', vars.k3s.master_ip, 'http-metrics', 10252),
+      utils.newEndpoint('kube-controller-manager-prometheus-discovery', 'kube-system', vars.k3s.master_ip, 'http-metrics', 10252),
 
     kubeSchedulerPrometheusDiscoveryEndpoints:
-      utils.newEndpoint('kube-scheduler', 'kube-system', vars.k3s.master_ip, 'http-metrics', 10251),
+      utils.newEndpoint('kube-scheduler-prometheus-discovery', 'kube-system', vars.k3s.master_ip, 'http-metrics', 10251),
 
     serviceMonitorKubelet+:
       {