fix: rm azure monitor (#1584)

Co-authored-by: ElderMatt <matthew.elderhorst@hotmail.com> Co-authored-by: Jehoszafat Zimnowoda <jehoszafat.zimnowoda@redkubes.com>
linode · Apr 29, 2024 · 056a3cc · 056a3cc
1 parent 6c0adc3
commit 056a3cc
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 9,973 deletions.
diff --git a/charts/grafana-dashboards/azure/azure-appgw.json b/charts/grafana-dashboards/azure/azure-appgw.json
diff --git a/charts/grafana-dashboards/azure/azure-mariadb.json b/charts/grafana-dashboards/azure/azure-mariadb.json
diff --git a/charts/grafana-dashboards/azure/azure-redis.json b/charts/grafana-dashboards/azure/azure-redis.json
diff --git a/charts/grafana-dashboards/azure/azure-storage.json b/charts/grafana-dashboards/azure/azure-storage.json
diff --git a/charts/grafana-dashboards/values.yaml b/charts/grafana-dashboards/values.yaml
@@ -1,6 +1,5 @@
 folders:
   - argo
-  - azure
   - cloudnative-pg
   - falco
   - falco-teams

diff --git a/helmfile.d/helmfile-60.teams.yaml b/helmfile.d/helmfile-60.teams.yaml
@@ -184,9 +184,6 @@ releases:
                   tag: 'http.path'
                 lokiSearch:
                   datasourceUid: 'loki'
-    {{- if ($team | get "azureMonitor" ($v | get "azure.monitor" nil)) }}
-            - {{- tpl (readFile "../helmfile.d/snippets/azure-monitor.gotmpl") ($team | get "azureMonitor" ($v | get "azure.monitor")) | toString | nindent 14 }}
-    {{- end }}
     {{- if has "msteams" ($team | get "alerts.receivers" list) }}
   - name: prometheus-msteams-{{ $teamId }}
     installed: {{ $team | get "managedMonitoring.prometheus" false }}

diff --git a/helmfile.d/snippets/azure-monitor.gotmpl b/helmfile.d/snippets/azure-monitor.gotmpl
diff --git a/tests/fixtures/env/cluster.yaml b/tests/fixtures/env/cluster.yaml
@@ -5,5 +5,5 @@ cluster:
     k8sContext: otomi-eks-demo
     name: demo
     owner: redkubes
-    provider: linode
+    provider: azure
     region: eu-central-1
diff --git a/values-changes.yaml b/values-changes.yaml
@@ -149,3 +149,5 @@ changes:
       - 'apps.prometheus.remoteWrite.otomiThanos'
       - 'apps.ingress-azure'
       - 'otomi.hasCloudLB'
+      - 'monitor'
+      - 'azureMonitor'
diff --git a/values-schema.yaml b/values-schema.yaml
@@ -212,47 +212,6 @@ definitions:
           - AzureChinaCloud
           - AzureUSGovernment
           - AzureGermanCloud
-      monitor:
-        additionalProperties: false
-        properties:
-          appInsightsApiKey:
-            $ref: '#/definitions/azure/definitions/clientSecret'
-            title: AppInsights api key
-            description: An Azure AppInsights client secret.
-          appInsightsAppId:
-            $ref: '#/definitions/azure/definitions/clientId'
-            title: AppInsights app id
-          azureLogAnalyticsSameAs:
-            title: LogAnalytics using same creds?
-            type: boolean
-            default: true
-          clientId:
-            $ref: '#/definitions/azure/definitions/clientId'
-          clientSecret:
-            $ref: '#/definitions/azure/definitions/clientSecret'
-          logAnalyticsClientId:
-            $ref: '#/definitions/azure/definitions/clientId'
-            title: LogAnalytics client id
-            description: An Azure client secret.
-          logAnalyticsClientSecret:
-            $ref: '#/definitions/azure/definitions/clientSecret'
-            title: LogAnalytics client secret
-            description: An Azure client secret.
-          logAnalyticsTenantId:
-            $ref: '#/definitions/azure/definitions/tenantId'
-            title: LogAnalytics tenant id
-            description: An Azure tenant id.
-          logAnalyticsDefaultWorkspace:
-            title: LogAnalytics default workspace to show
-            description: An Azure LogAnalytics workspace.
-            type: string
-          subscriptionId:
-            $ref: '#/definitions/azure/definitions/subscriptionId'
-          tenantId:
-            $ref: '#/definitions/azure/definitions/tenantId'
-        required:
-          - clientId
-          - clientSecret
       tenantId:
         title: Azure tenant id
         description: An Azure tenant id.
@@ -1175,8 +1134,6 @@ definitions:
         properties:
           shortcuts:
             $ref: '#/definitions/shortcuts'
-      azureMonitor:
-        $ref: '#/definitions/azure/definitions/monitor'
       backups:
         type: array
         items:
@@ -1679,9 +1636,6 @@ properties:
             default: false
             description: Indicates Azure Application Gateway Ingress Controller add-on is installed by AKS.
             type: boolean
-      monitor:
-        $ref: '#/definitions/azure/definitions/monitor'
-
   cloud:
     additionalProperties: true
     properties:

diff --git a/values/prometheus-operator/prometheus-operator.gotmpl b/values/prometheus-operator/prometheus-operator.gotmpl
@@ -302,9 +302,6 @@ grafana:
           datasourceUid: 'loki'
     {{- end }}
     {{- end }}
-    {{- if $v | get "azure.monitor" nil }}
-    - {{- tpl (readFile "../../helmfile.d/snippets/azure-monitor.gotmpl") $v.azure.monitor | toString | nindent 6 }}
-    {{- end }}
   adminPassword: {{ $g | get "adminPassword" $v.otomi.adminPassword }}
   grafana.ini: {{- $grafanaIni | nindent 4 }}
     server: