Merge pull request k0smotron#597 from makhov/monitoring-stack-fix-for…

…-external-etcd Fixes scrape config for the external etcd
makhov · May 29, 2024 · 29b3bed · 29b3bed
2 parents 94d6845 + 859c9fa
commit 29b3bed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/internal/controller/k0smotron.io/k0smotroncluster_monitoring_config.go b/internal/controller/k0smotron.io/k0smotroncluster_monitoring_config.go
@@ -37,7 +37,13 @@ func init() {
 
 func (r *ClusterReconciler) generateMonitoringCM(kmc *km.Cluster) (v1.ConfigMap, error) {
 	var entrypointBuf bytes.Buffer
-	err := prometheusConfigTmpl.Execute(&entrypointBuf, kmc)
+	err := prometheusConfigTmpl.Execute(&entrypointBuf, struct {
+		Kmc         *km.Cluster
+		EtcdSvcName string
+	}{
+		Kmc:         kmc,
+		EtcdSvcName: kmc.GetEtcdServiceName(),
+	})
 	if err != nil {
 		return v1.ConfigMap{}, err
 	}
@@ -87,29 +93,29 @@ scrape_configs:
       cert_file: /var/lib/k0s/pki/admin.crt
       key_file: /var/lib/k0s/pki/admin.key 
     static_configs:
-      - targets: ["localhost:{{ .Spec.Service.APIPort }}"]
+      - targets: ["localhost:{{ .Kmc.Spec.Service.APIPort }}"]
         labels:
           component: kube-apiserver
-          k0smotron_cluster: "{{ .Name }}"
+          k0smotron_cluster: "{{ .Kmc.Name }}"
       - targets: ["localhost:10259"]
         labels:
           component: kube-scheduler
-          k0smotron_cluster: "{{ .Name }}"
+          k0smotron_cluster: "{{ .Kmc.Name }}"
       - targets: ["localhost:10257"]
         labels:
           component: kube-controller-manager
-          k0smotron_cluster: "{{ .Name }}"
+          k0smotron_cluster: "{{ .Kmc.Name }}"
   - job_name: "k0smotron_etcd_metrics"
     scheme: https
     tls_config: 
       insecure_skip_verify: true
-      cert_file: /var/lib/k0s/pki/etcd/ca.crt
-      key_file: /var/lib/k0s/pki/etcd/ca.key
+      cert_file: /var/lib/k0s/pki/etcd-ca.crt
+      key_file: /var/lib/k0s/pki/etcd-ca.key
     static_configs:
-      - targets: ["localhost:2379"]
+      - targets: ["{{ .EtcdSvcName }}:2379"]
         labels:
           component: etcd
-          k0smotron_cluster: "{{ .Name }}"
+          k0smotron_cluster: "{{ .Kmc.Name }}"
 `
 
 const nginxConf = `

diff --git a/inttest/monitoring/monitoring_test.go b/inttest/monitoring/monitoring_test.go
@@ -91,15 +91,15 @@ func (s *MonitoringSuite) TestK0sGetsUp() {
 		b, err := kc.RESTClient().
 			Get().
 			AbsPath("/api/v1/namespaces/default/services/prometheus-server:http/proxy/api/v1/query").
-			Param("query", "workqueue_work_duration_seconds_count").
+			Param("query", "process_open_fds").
 			DoRaw(s.Context())
 		if err != nil {
 			return true, err
 		}
 
 		out := string(b)
 
-		return strings.Contains(out, `"k0smotron_cluster":"kmc-test"`), nil
+		return strings.Contains(out, `k0smotron_etcd_metrics`), nil
 	})
 	s.Require().NoError(err)
 }