diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index 08cb62195..c450aeeaa 100644 --- a/.github/workflows/zz_generated.check_values_schema.yaml +++ b/.github/workflows/zz_generated.check_values_schema.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # name: 'Values and schema' on: diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index feacf1a6d..57c5dd5ca 100644 --- a/.github/workflows/zz_generated.create_release.yaml +++ b/.github/workflows/zz_generated.create_release.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # name: Create Release on: @@ -15,7 +15,7 @@ on: jobs: debug_info: name: Debug info - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Print github context JSON run: | @@ -24,7 +24,7 @@ jobs: EOF gather_facts: name: Gather facts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: project_go_path: ${{ steps.get_project_go_path.outputs.path }} ref_version: ${{ steps.ref_version.outputs.refversion }} @@ -84,7 +84,7 @@ jobs: echo "refversion=${refversion}" >> $GITHUB_OUTPUT update_project_go: name: Update project.go - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ needs.gather_facts.outputs.version != '' && needs.gather_facts.outputs.project_go_path != '' && needs.gather_facts.outputs.ref_version != 'true' }} needs: - gather_facts @@ -146,7 +146,7 @@ jobs: hub pull-request -f -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }} create_release: name: Create release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.version }} @@ -194,7 +194,7 @@ jobs: create-release-branch: name: Create release branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.version }} diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index f2a8f0e6f..6f07166ea 100644 --- a/.github/workflows/zz_generated.create_release_pr.yaml +++ b/.github/workflows/zz_generated.create_release_pr.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # name: Create Release PR on: @@ -30,7 +30,7 @@ on: jobs: debug_info: name: Debug info - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Print github context JSON run: | @@ -39,7 +39,7 @@ jobs: EOF gather_facts: name: Gather facts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: repo_name: ${{ steps.gather_facts.outputs.repo_name }} branch: ${{ steps.gather_facts.outputs.branch }} @@ -136,7 +136,7 @@ jobs: fi create_release_pr: name: Create release PR - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.skip != 'true' }} diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 727075b77..2c70a482b 100644 --- a/.github/workflows/zz_generated.gitleaks.yaml +++ b/.github/workflows/zz_generated.gitleaks.yaml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # name: gitleaks diff --git a/Makefile b/Makefile index 28923292c..6b6025aaa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # include Makefile.*.mk diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 0488e3447..0929f9089 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index a82c697d9..bcb0dd23a 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # APPLICATION := $(shell go list -m | cut -d '/' -f 3) diff --git a/Makefile.gen.k8sapi.mk b/Makefile.gen.k8sapi.mk index 51d616280..8aecdc539 100644 --- a/Makefile.gen.k8sapi.mk +++ b/Makefile.gen.k8sapi.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@6.6.0 +# devctl@6.9.0 # # Directories. diff --git a/files/templates/scrapeconfigs/_tlsconfig.yaml b/files/templates/scrapeconfigs/_tlsconfig.yaml index 2ede015fb..0693617fa 100644 --- a/files/templates/scrapeconfigs/_tlsconfig.yaml +++ b/files/templates/scrapeconfigs/_tlsconfig.yaml @@ -1,19 +1,19 @@ [[- define "_tlsconfig" -]] [[- if ne .ClusterType "management_cluster" -]] -[[- if eq .AuthenticationType "token" -]] -bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token -[[- end ]] -tls_config: - ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca -[[- if eq .AuthenticationType "certificates" ]] - cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt - key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key -[[- end ]] - insecure_skip_verify: false -[[- else -]] -bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token -tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true + [[- if eq .AuthenticationType "token" ]] + bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token + [[- end ]] + tls_config: + ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca + [[- if eq .AuthenticationType "certificates" ]] + cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt + key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key + [[- end ]] + insecure_skip_verify: false +[[- else ]] + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + insecure_skip_verify: true [[- end -]] [[- end -]] diff --git a/files/templates/scrapeconfigs/_tlsconfig_skip.yaml b/files/templates/scrapeconfigs/_tlsconfig_skip.yaml index 698a2704a..7bafaadc2 100644 --- a/files/templates/scrapeconfigs/_tlsconfig_skip.yaml +++ b/files/templates/scrapeconfigs/_tlsconfig_skip.yaml @@ -1,19 +1,19 @@ [[- define "_tlsconfig_skip" -]] [[- if ne .ClusterType "management_cluster" -]] -[[- if eq .AuthenticationType "token" -]] -bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token -[[- end ]] -tls_config: - ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca -[[- if eq .AuthenticationType "certificates" ]] - cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt - key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key -[[- end ]] - insecure_skip_verify: true -[[- else -]] -bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token -tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true + [[- if eq .AuthenticationType "token" ]] + bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token + [[- end ]] + tls_config: + ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca + [[- if eq .AuthenticationType "certificates" ]] + cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt + key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key + [[- end ]] + insecure_skip_verify: true +[[- else ]] + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + insecure_skip_verify: true [[- end -]] [[- end -]] diff --git a/files/templates/scrapeconfigs/additional-scrape-configs.template.yaml b/files/templates/scrapeconfigs/additional-scrape-configs.template.yaml index 685133e7b..04171904a 100644 --- a/files/templates/scrapeconfigs/additional-scrape-configs.template.yaml +++ b/files/templates/scrapeconfigs/additional-scrape-configs.template.yaml @@ -1,11 +1,11 @@ -[[- if not (contains "kube-apiserver" .IgnoredTargets) ]] +[[- if not (contains "kube-apiserver" .IgnoredTargets) -]] - job_name: [[ .ClusterID ]]-prometheus/kubernetes-apiserver-[[ .ClusterID ]]/0 honor_labels: true scheme: https kubernetes_sd_configs: - role: endpoints [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__meta_kubernetes_service_label_component] regex: apiserver @@ -26,7 +26,7 @@ kubernetes_sd_configs: - role: node [[- include "_apiserver" . ]] -[[ include "_tlsconfig" . | indent 2 ]] +[[- include "_tlsconfig" . ]] relabel_configs: - target_label: __address__ replacement: [[ .APIServerURL ]] @@ -56,7 +56,7 @@ names: - giantswarm [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__meta_kubernetes_service_label_app_kubernetes_io_name] regex: falco-exporter @@ -74,7 +74,7 @@ kubernetes_sd_configs: - role: node [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - target_label: app replacement: kubelet @@ -104,7 +104,7 @@ kubernetes_sd_configs: - role: node [[- include "_apiserver" . ]] -[[ include "_tlsconfig" . | indent 2 ]] +[[- include "_tlsconfig" . ]] relabel_configs: - source_labels: [__address__] target_label: instance @@ -145,7 +145,7 @@ kubernetes_sd_configs: - role: pod [[- include "_apiserver" . ]] -[[ include "_tlsconfig" . | indent 2 ]] +[[- include "_tlsconfig" . ]] relabel_configs: - source_labels: [__address__] replacement: ${1}:9091 @@ -169,14 +169,14 @@ honor_labels: true scheme: https kubernetes_sd_configs: - [[ if .CAPIManagementCluster ]] + [[- if .CAPIManagementCluster ]] - role: pod namespaces: names: - kube-system - [[ else ]] + [[- else ]] - role: node - [[ end ]] + [[- end ]] [[- include "_apiserver" . ]] [[- if eq .ClusterType "management_cluster" ]] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -209,20 +209,20 @@ target_label: __address__ replacement: ${1}:2379 action: replace -[[ if eq .ClusterType "management_cluster" ]] + [[- if eq .ClusterType "management_cluster" ]] # if the 'ip' label is present, use the value - source_labels: [__meta_kubernetes_node_label_ip] regex: (.+) target_label: __address__ replacement: ${1}:2379 action: replace -[[- end ]] -[[- if and (eq .ClusterType "workload_cluster") (.WorkloadClusterETCDDomain) ]] + [[- end ]] + [[- if and (eq .ClusterType "workload_cluster") (.WorkloadClusterETCDDomain) ]] - source_labels: [__address__] target_label: __address__ replacement: [[ .WorkloadClusterETCDDomain ]] action: replace -[[- end ]] + [[- end ]] [[- end ]] - target_label: app replacement: etcd @@ -245,7 +245,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__address__] [[- if or .CAPIManagementCluster (eq .ClusterType "management_cluster") ]] @@ -297,7 +297,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__address__] [[- if or .CAPIManagementCluster (eq .ClusterType "management_cluster") ]] @@ -348,7 +348,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__address__] replacement: $1:10249 @@ -382,7 +382,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__address__] target_label: instance @@ -416,13 +416,13 @@ - role: endpoints namespaces: names: -[[ if eq .ClusterType "management_cluster" ]] +[[- if eq .ClusterType "management_cluster" ]] - monitoring -[[ else ]] +[[- else ]] - kube-system -[[ end ]] +[[- end ]] [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__address__] target_label: instance @@ -450,7 +450,7 @@ kubernetes_sd_configs: - role: pod [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - target_label: __address__ replacement: [[ .APIServerURL ]] @@ -481,7 +481,7 @@ kubernetes_sd_configs: - role: endpoints [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - source_labels: [__meta_kubernetes_service_annotationpresent_giantswarm_io_monitoring, __meta_kubernetes_service_labelpresent_giantswarm_io_monitoring] regex: .*(true).* @@ -638,7 +638,7 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment -[[ if eq .ClusterType "management_cluster" ]] +[[- if eq .ClusterType "management_cluster" ]] # cert-operator (missing label) (versionned so it needs to be kept) - job_name: [[ .ClusterID ]]-prometheus/cert-operator-[[ .ClusterID ]]/0 honor_labels: true @@ -680,7 +680,7 @@ action: drop [[ include "_common" . | indent 2 ]] [[ include "_labelingschema" . | indent 2 ]] -[[ if .Bastions ]] +[[- if .Bastions ]] # bastion exporters - job_name: [[ .ClusterID ]]-prometheus/bastions-[[ .ClusterID ]]/0 honor_labels: true @@ -695,12 +695,12 @@ role: bastion relabel_configs: [[ include "_labelingschema" . | indent 2 ]] -[[ end ]] +[[- end ]] [[- if .AdditionalScrapeConfigs ]] # installation-specific configs from config repo [[ .AdditionalScrapeConfigs ]] [[- end ]] -[[ if eq .Provider "kvm" ]] +[[- if eq .Provider "kvm" ]] # flannel-operator (missing label) - job_name: [[ .ClusterID ]]-prometheus/flannel-operator-[[ .ClusterID ]]/0 honor_labels: true @@ -788,8 +788,8 @@ app: mayu relabel_configs: [[ include "_labelingschema" . | indent 2 ]] -[[ end ]] -[[ if not .CAPIManagementCluster ]] +[[- end ]] +[[- if not .CAPIManagementCluster ]] - job_name: [[ .ClusterID ]]-prometheus/vault-[[ .ClusterID ]]/0 honor_labels: true scheme: http @@ -808,7 +808,7 @@ app: vault-etcd-backups-exporter relabel_configs: [[ include "_labelingschema" . | indent 2 ]] -[[ end ]] +[[- end ]] # nginx-ingress-controller - job_name: [[ .ClusterID ]]-prometheus/nginx-ingress-controller-[[ .ClusterID ]]/0 honor_labels: true @@ -819,7 +819,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig" . | indent 2 ]] +[[- include "_tlsconfig" . ]] relabel_configs: - source_labels: [__meta_kubernetes_service_annotationpresent_giantswarm_io_monitoring, __meta_kubernetes_service_labelpresent_giantswarm_io_monitoring] regex: .*(true).* @@ -847,7 +847,7 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop -[[ end ]] +[[- end ]] # prometheus - job_name: [[ .ClusterID ]]-prometheus/prometheus-[[ .ClusterID ]]/0 honor_labels: true @@ -870,7 +870,7 @@ names: - kube-system [[- include "_apiserver" . ]] -[[ include "_tlsconfig_skip" . | indent 2 ]] +[[- include "_tlsconfig_skip" . ]] relabel_configs: - replacement: http target_label: __scheme__ @@ -886,4 +886,4 @@ replacement: $1 [[ include "_common" . | indent 2 ]] [[ include "_labelingschema" . | indent 2 ]] -[[ end ]] +[[- end ]] diff --git a/renovate.json b/renovate.json index e6ecf2339..247af9d58 100644 --- a/renovate.json +++ b/renovate.json @@ -43,9 +43,10 @@ ".github/workflows/pre_commit_*.yaml" ], "ignoreDeps": [ + "actions/setup-go", "architect", - "zricethezav/gitleaks-action", - "actions/setup-go" + "github.com/imdario/mergo", + "zricethezav/gitleaks-action" ], "regexManagers": [ { diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-1-awsconfig.golden index d6d35aa8f..fc6791242 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -293,9 +292,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.alice:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -316,7 +313,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -672,9 +668,7 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -979,7 +973,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-2-azureconfig.golden index f5ccc7f7d..764568a55 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -293,9 +292,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.foo:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -316,7 +313,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -506,9 +502,7 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -813,7 +807,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-3-kvmconfig.golden index 7478cf848..2d40f76c7 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -293,9 +292,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.bar:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -316,7 +313,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -672,9 +668,7 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -979,7 +973,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-4-control-plane.golden index c346a2a3f..c30f7de78 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -323,9 +322,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -342,7 +339,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - # if the 'ip' label is present, use the value - source_labels: [__meta_kubernetes_node_label_ip] regex: (.+) @@ -684,9 +680,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -976,7 +970,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1052,9 +1045,6 @@ # Add customer label. - target_label: customer replacement: pmo - - - - job_name: kubernetes-prometheus/vault-kubernetes/0 honor_labels: true scheme: http @@ -1093,7 +1083,6 @@ # Add customer label. - target_label: customer replacement: pmo - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1156,7 +1145,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1250,4 +1238,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-5-cluster-api-v1alpha3.golden index eac1eed25..c193d2cb8 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/aws/case-5-cluster-api-v1alpha3.golden @@ -1,4 +1,3 @@ - - job_name: baz-prometheus/kubernetes-apiserver-baz/0 honor_labels: true scheme: https @@ -293,9 +292,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.baz:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -316,7 +313,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -506,9 +502,7 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 bearer_token_file: /etc/prometheus/secrets/cluster-certificates/token tls_config: @@ -813,7 +807,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-1-awsconfig.golden index d92e1261a..af685b4da 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -465,7 +455,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -551,7 +540,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -628,7 +616,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -700,16 +687,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -780,7 +764,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -840,7 +823,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -1016,7 +998,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-2-azureconfig.golden index f5d38c8cb..e0f123d3a 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -456,7 +446,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -528,16 +517,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -608,7 +594,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -668,7 +653,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -844,7 +828,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-3-kvmconfig.golden index ada2b8112..3b03d4a10 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -465,7 +455,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -551,7 +540,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -628,7 +616,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -700,16 +687,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -780,7 +764,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -840,7 +823,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -1016,7 +998,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-4-control-plane.golden index 9c0ed4de3..3e4428048 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -323,9 +322,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -342,7 +339,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - # if the 'ip' label is present, use the value - source_labels: [__meta_kubernetes_node_label_ip] regex: (.+) @@ -684,9 +680,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -976,7 +970,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1052,9 +1045,6 @@ # Add customer label. - target_label: customer replacement: pmo - - - - job_name: kubernetes-prometheus/vault-kubernetes/0 honor_labels: true scheme: http @@ -1093,7 +1083,6 @@ # Add customer label. - target_label: customer replacement: pmo - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1156,7 +1145,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1250,4 +1238,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-5-cluster-api-v1alpha3.golden index bb32f0851..734d661e4 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/azure/case-5-cluster-api-v1alpha3.golden @@ -1,4 +1,3 @@ - - job_name: baz-prometheus/kubernetes-apiserver-baz/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -456,7 +446,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -528,16 +517,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -608,7 +594,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -668,7 +653,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -844,7 +828,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-1-awsconfig.golden index 070110d8a..c0763e2aa 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-2-azureconfig.golden index 36df6959b..c61b23314 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-3-kvmconfig.golden index a0bcc1d19..75135f85e 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-4-control-plane.golden index ed3f1622a..27ca8d66d 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -274,12 +273,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -633,9 +630,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -925,7 +920,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1001,7 +995,6 @@ # Add customer label. - target_label: customer replacement: pmo - # installation-specific configs from config repo - job_name: test1 static_configs: @@ -1017,8 +1010,6 @@ relabel_configs: - source_labels: [__address__] target_label: __param_target - - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1081,7 +1072,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1175,4 +1165,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-5-cluster-api-v1alpha3.golden index 3c770c0dc..b516610b4 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/capa/case-5-cluster-api-v1alpha3.golden @@ -11,7 +11,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -73,7 +72,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -139,7 +137,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -201,12 +198,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -276,7 +271,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -353,7 +347,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -425,16 +418,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -504,7 +494,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -683,7 +672,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-1-awsconfig.golden index ed782f3ca..4f8ba7438 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-2-azureconfig.golden index 4d5bccbbe..8c967cab4 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-3-kvmconfig.golden index 8ae4e6a63..d3e7d9326 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-4-control-plane.golden index 276f4876f..52111b600 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -274,12 +273,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -633,9 +630,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -925,7 +920,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1001,7 +995,6 @@ # Add customer label. - target_label: customer replacement: pmo - # installation-specific configs from config repo - job_name: test1 static_configs: @@ -1017,8 +1010,6 @@ relabel_configs: - source_labels: [__address__] target_label: __param_target - - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1081,7 +1072,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1175,4 +1165,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-5-cluster-api-v1alpha3.golden index 0e601ad80..a44c08184 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/gcp/case-5-cluster-api-v1alpha3.golden @@ -11,7 +11,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -73,7 +72,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -139,7 +137,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -201,12 +198,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -276,7 +271,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -353,7 +347,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -425,16 +418,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -504,7 +494,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -683,7 +672,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-1-awsconfig.golden index d079e8327..0e975484c 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -465,7 +455,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -551,7 +540,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -628,7 +616,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -700,16 +687,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -780,7 +764,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -840,7 +823,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -1016,7 +998,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-2-azureconfig.golden index 0b4339ede..1a36a1fda 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -456,7 +446,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -528,16 +517,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -608,7 +594,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -668,7 +653,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -844,7 +828,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-3-kvmconfig.golden index 93b2e039b..e7c9dddc5 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -465,7 +455,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -551,7 +540,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -628,7 +616,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -700,16 +687,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -780,7 +764,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -840,7 +823,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -1016,7 +998,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-4-control-plane.golden index 93762e117..ad3149bdb 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -323,9 +322,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -342,7 +339,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - # if the 'ip' label is present, use the value - source_labels: [__meta_kubernetes_node_label_ip] regex: (.+) @@ -684,9 +680,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -976,7 +970,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1052,7 +1045,6 @@ # Add customer label. - target_label: customer replacement: pmo - # installation-specific configs from config repo - job_name: test1 static_configs: @@ -1068,7 +1060,6 @@ relabel_configs: - source_labels: [__address__] target_label: __param_target - # flannel-operator (missing label) - job_name: kubernetes-prometheus/flannel-operator-kubernetes/0 honor_labels: true @@ -1278,8 +1269,6 @@ # Add customer label. - target_label: customer replacement: pmo - - - job_name: kubernetes-prometheus/vault-kubernetes/0 honor_labels: true scheme: http @@ -1318,7 +1307,6 @@ # Add customer label. - target_label: customer replacement: pmo - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1381,7 +1369,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1475,4 +1462,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-5-cluster-api-v1alpha3.golden index cdf7c61ff..76e86c900 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/kvm/case-5-cluster-api-v1alpha3.golden @@ -1,4 +1,3 @@ - - job_name: baz-prometheus/kubernetes-apiserver-baz/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -118,7 +115,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -180,7 +176,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -246,7 +241,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -308,9 +302,7 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: node - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -332,7 +324,6 @@ target_label: __address__ replacement: ${1}:2379 action: replace - - target_label: app replacement: etcd - source_labels: [__address__] @@ -379,7 +370,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -456,7 +446,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -528,16 +517,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -608,7 +594,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -668,7 +653,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -844,7 +828,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-1-awsconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-1-awsconfig.golden index 7e424ca29..911092f02 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-1-awsconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-1-awsconfig.golden @@ -1,4 +1,3 @@ - - job_name: alice-prometheus/kubernetes-apiserver-alice/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.alice:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: alice-prometheus/prometheus-alice/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-2-azureconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-2-azureconfig.golden index d625aa864..5a20e649b 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-2-azureconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-2-azureconfig.golden @@ -1,4 +1,3 @@ - - job_name: foo-prometheus/kubernetes-apiserver-foo/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.foo:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: foo-prometheus/prometheus-foo/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-3-kvmconfig.golden b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-3-kvmconfig.golden index 1b83940ee..c01906fa1 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-3-kvmconfig.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-3-kvmconfig.golden @@ -1,4 +1,3 @@ - - job_name: bar-prometheus/kubernetes-apiserver-bar/0 honor_labels: true scheme: https @@ -10,7 +9,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -61,7 +59,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -123,7 +120,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -189,7 +185,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -251,12 +246,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -326,7 +319,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -412,7 +404,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -498,7 +489,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -575,7 +565,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -647,16 +636,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.bar:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -727,7 +713,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -787,7 +772,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -963,7 +947,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: bar-prometheus/prometheus-bar/0 honor_labels: true diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-4-control-plane.golden b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-4-control-plane.golden index a798e7c2f..aa81e9c4b 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-4-control-plane.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-4-control-plane.golden @@ -1,4 +1,3 @@ - - job_name: kubernetes-prometheus/kubernetes-apiserver-kubernetes/0 honor_labels: true scheme: https @@ -274,12 +273,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /etc/prometheus/secrets/etcd-certificates/ca @@ -633,9 +630,7 @@ - role: endpoints namespaces: names: - - monitoring - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -925,7 +920,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # cert-operator (missing label) (versionned so it needs to be kept) - job_name: kubernetes-prometheus/cert-operator-kubernetes/0 honor_labels: true @@ -1001,7 +995,6 @@ # Add customer label. - target_label: customer replacement: pmo - # installation-specific configs from config repo - job_name: test1 static_configs: @@ -1017,8 +1010,6 @@ relabel_configs: - source_labels: [__address__] target_label: __param_target - - # nginx-ingress-controller - job_name: kubernetes-prometheus/nginx-ingress-controller-kubernetes/0 honor_labels: true @@ -1081,7 +1072,6 @@ - source_labels: [__name__] regex: nginx_ingress_controller_(bytes_sent_bucket|request_size_bucket|response_duration_seconds_bucket|response_size_bucket|request_duration_seconds_count|connect_duration_seconds_bucket|header_duration_seconds_bucket|bytes_sent_count|request_duration_seconds_sum|bytes_sent_sum|request_size_count|response_size_count|response_duration_seconds_sum|response_duration_seconds_count|ingress_upstream_latency_seconds|ingress_upstream_latency_seconds_sum|ingress_upstream_latency_seconds_count) action: drop - # prometheus - job_name: kubernetes-prometheus/prometheus-kubernetes/0 honor_labels: true @@ -1175,4 +1165,3 @@ # Add customer label. - target_label: customer replacement: pmo - diff --git a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-5-cluster-api-v1alpha3.golden index ce0097988..d30812f24 100644 --- a/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/monitoring/scrapeconfigs/test/openstack/case-5-cluster-api-v1alpha3.golden @@ -11,7 +11,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -73,7 +72,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -139,7 +137,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -201,12 +198,10 @@ honor_labels: true scheme: https kubernetes_sd_configs: - - role: pod namespaces: names: - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca @@ -276,7 +271,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -353,7 +347,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -425,16 +418,13 @@ - role: endpoints namespaces: names: - - kube-system - api_server: https://master.baz:443 tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -504,7 +494,6 @@ cert_file: /etc/prometheus/secrets/cluster-certificates/crt key_file: /etc/prometheus/secrets/cluster-certificates/key insecure_skip_verify: false - tls_config: ca_file: /etc/prometheus/secrets/cluster-certificates/ca cert_file: /etc/prometheus/secrets/cluster-certificates/crt @@ -683,7 +672,6 @@ action: replace - action: labeldrop regex: label_giantswarm_io_machine_pool|label_giantswarm_io_machine_deployment - # prometheus - job_name: baz-prometheus/prometheus-baz/0 honor_labels: true