From 0b6a33e3a0458d888565af6c36747bc57b5df9bd Mon Sep 17 00:00:00 2001 From: Kaveesh Dubey Date: Wed, 8 Nov 2023 15:33:47 -0800 Subject: [PATCH] fix struct --- .../addon-chart/azure-monitor-metrics-addon/Chart.yaml | 4 ++-- .../addon-chart/azure-monitor-metrics-addon/values.yaml | 8 ++++---- otelcollector/prom-config-validator-builder/main.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 82010c1e1..ad9845890 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-11-08-2023-3fd2a1e2 +version: 6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb # 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-11-08-2023-3fd2a1e2" +appVersion: "6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb" # 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 c27055585..758bd9791 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-11-08-2023-3fd2a1e2" - ImageTagWin: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-win" - ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-targetallocator" - ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-cfg" + ImageTag: "6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb" + ImageTagWin: "6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb-win" + ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb-targetallocator" + ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-11-08-2023-312ebccb-cfg" TargetAllocatorEnabled: false DeploymentReplicas: 1 # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner. diff --git a/otelcollector/prom-config-validator-builder/main.go b/otelcollector/prom-config-validator-builder/main.go index 8e6fba3df..dae9bf98b 100644 --- a/otelcollector/prom-config-validator-builder/main.go +++ b/otelcollector/prom-config-validator-builder/main.go @@ -40,7 +40,7 @@ type OtelConfig struct { Logs struct { Level interface{} `yaml:"level"` Encoding interface{} `yaml:"encoding"` - output_paths interface{} `yaml:"output_paths"` + OutputPaths []string `yaml:"output_paths"` } `yaml:"logs"` } `yaml:"telemetry"` } `yaml:"service"`