From de1a5fb5a39c0dac1664c09c33d4dbbce9f48e4b Mon Sep 17 00:00:00 2001 From: Kaveesh Dubey Date: Wed, 25 Oct 2023 14:54:19 -0700 Subject: [PATCH] enable apiserver, etcd for reference app --- .../controlplane_apiserver.yml | 68 +++++++++---------- .../controlplane_etcd.yml | 68 +++++++++---------- .../azure-monitor-metrics-addon/Chart.yaml | 4 +- .../azure-monitor-metrics-addon/values.yaml | 8 +-- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/otelcollector/configmapparser/default-prom-configs/controlplane_apiserver.yml b/otelcollector/configmapparser/default-prom-configs/controlplane_apiserver.yml index bf799e4a4..028254cc4 100644 --- a/otelcollector/configmapparser/default-prom-configs/controlplane_apiserver.yml +++ b/otelcollector/configmapparser/default-prom-configs/controlplane_apiserver.yml @@ -1,36 +1,36 @@ -# scrape_configs: -# - job_name: prometheus_ref_app_apiserver -# scheme: http -# scrape_interval: 60s -# kubernetes_sd_configs: -# - role: pod -# relabel_configs: -# - source_labels: [__meta_kubernetes_pod_label_app] -# action: keep -# regex: "prometheus-reference-app" - scrape_configs: - - job_name: controlplane_apiserver - scrape_interval: $$SCRAPE_INTERVAL$$ - label_limit: 63 - label_name_length_limit: 511 - label_value_length_limit: 1023 +scrape_configs: + - job_name: prometheus_ref_app_apiserver + scheme: http + scrape_interval: 60s kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - $$POD_NAMESPACE$$ - scheme: https - tls_config: - ca_file: /etc/kubernetes/secrets/ca.pem - insecure_skip_verify: true - bearer_token_file: /etc/kubernetes/secrets/token + - role: pod relabel_configs: - - source_labels: - - __meta_kubernetes_pod_label_k8s_app - - __meta_kubernetes_pod_container_name - action: keep - regex: kube-apiserver;kube-apiserver - - source_labels: [ __meta_kubernetes_pod_name ] - regex: (.*) - target_label: pod - action: replace \ No newline at end of file + - source_labels: [__meta_kubernetes_pod_label_app] + action: keep +# regex: "prometheus-reference-app" + # scrape_configs: + # - job_name: controlplane_apiserver + # scrape_interval: $$SCRAPE_INTERVAL$$ + # label_limit: 63 + # label_name_length_limit: 511 + # label_value_length_limit: 1023 + # kubernetes_sd_configs: + # - role: endpoints + # namespaces: + # names: + # - $$POD_NAMESPACE$$ + # scheme: https + # tls_config: + # ca_file: /etc/kubernetes/secrets/ca.pem + # insecure_skip_verify: true + # bearer_token_file: /etc/kubernetes/secrets/token + # relabel_configs: + # - source_labels: + # - __meta_kubernetes_pod_label_k8s_app + # - __meta_kubernetes_pod_container_name + # action: keep + # regex: kube-apiserver;kube-apiserver + # - source_labels: [ __meta_kubernetes_pod_name ] + # regex: (.*) + # target_label: pod + # action: replace \ No newline at end of file diff --git a/otelcollector/configmapparser/default-prom-configs/controlplane_etcd.yml b/otelcollector/configmapparser/default-prom-configs/controlplane_etcd.yml index 290a2f1f7..2d81f3c7b 100644 --- a/otelcollector/configmapparser/default-prom-configs/controlplane_etcd.yml +++ b/otelcollector/configmapparser/default-prom-configs/controlplane_etcd.yml @@ -1,36 +1,36 @@ -# scrape_configs: -# - job_name: prometheus_ref_app_etcd -# scheme: http -# scrape_interval: 60s -# kubernetes_sd_configs: -# - role: pod -# relabel_configs: -# - source_labels: [__meta_kubernetes_pod_label_app] -# action: keep -# regex: "prometheus-reference-app" - scrape_configs: - - job_name: controlplane_etcd - scrape_interval: $$SCRAPE_INTERVAL$$ - label_limit: 63 - label_name_length_limit: 511 - label_value_length_limit: 1023 - follow_redirects: false - scheme: https +scrape_configs: + - job_name: prometheus_ref_app_etcd + scheme: http + scrape_interval: 60s kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - $$POD_NAMESPACE$$ - tls_config: - ca_file: /etc/kubernetes/secrets/etcd-client-ca.crt - cert_file: /etc/kubernetes/secrets/etcd-client.crt - key_file: /etc/kubernetes/secrets/etcd-client.key - insecure_skip_verify: true + - role: pod relabel_configs: - - source_labels: [ __meta_kubernetes_service_label_app, __meta_kubernetes_pod_container_port_number ] - action: keep - regex: etcd;2379 - - source_labels: [ __meta_kubernetes_pod_name ] - regex: (.*) - target_label: pod - action: replace \ No newline at end of file + - source_labels: [__meta_kubernetes_pod_label_app] + action: keep + regex: "prometheus-reference-app" + # scrape_configs: + # - job_name: controlplane_etcd + # scrape_interval: $$SCRAPE_INTERVAL$$ + # label_limit: 63 + # label_name_length_limit: 511 + # label_value_length_limit: 1023 + # follow_redirects: false + # scheme: https + # kubernetes_sd_configs: + # - role: endpoints + # namespaces: + # names: + # - $$POD_NAMESPACE$$ + # tls_config: + # ca_file: /etc/kubernetes/secrets/etcd-client-ca.crt + # cert_file: /etc/kubernetes/secrets/etcd-client.crt + # key_file: /etc/kubernetes/secrets/etcd-client.key + # insecure_skip_verify: true + # relabel_configs: + # - source_labels: [ __meta_kubernetes_service_label_app, __meta_kubernetes_pod_container_port_number ] + # action: keep + # regex: etcd;2379 + # - source_labels: [ __meta_kubernetes_pod_name ] + # regex: (.*) + # target_label: pod + # action: replace \ No newline at end of file diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml index cde555f56..f032f4999 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f +version: 6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3 # This is the version number of the application being deployed (basically, imagetag for the image built/compatible with this chart semver above). This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f" +appVersion: "6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3" # dependencies: # - name: prometheus-node-exporter # version: "4.21.0" diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml index 557cc5104..c6133a1d7 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml @@ -36,10 +36,10 @@ AzureMonitorMetrics: - validatingwebhookconfigurations - volumeattachments ImageRepository: "/azuremonitor/containerinsights/cidev/prometheus-collector/images" - ImageTag: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f" - ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-win" - ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-targetallocator" - ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-cfg" + ImageTag: "6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3" + ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3-win" + ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3-targetallocator" + ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-25-2023-6791c7d3-cfg" TargetAllocatorEnabled: false DeploymentReplicas: 1 # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner.