Skip to content

Commit 056a3cc

Browse files
srodenhuisElderMattJehoszafat Zimnowoda
authored
fix: rm azure monitor (#1584)
Co-authored-by: ElderMatt <[email protected]> Co-authored-by: Jehoszafat Zimnowoda <[email protected]>
1 parent 6c0adc3 commit 056a3cc

File tree

11 files changed

+3
-9973
lines changed

11 files changed

+3
-9973
lines changed

charts/grafana-dashboards/azure/azure-appgw.json

-2,202
This file was deleted.

charts/grafana-dashboards/azure/azure-mariadb.json

-2,312
This file was deleted.

charts/grafana-dashboards/azure/azure-redis.json

-3,265
This file was deleted.

charts/grafana-dashboards/azure/azure-storage.json

-2,121
This file was deleted.

charts/grafana-dashboards/values.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
folders:
22
- argo
3-
- azure
43
- cloudnative-pg
54
- falco
65
- falco-teams

helmfile.d/helmfile-60.teams.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ releases:
184184
tag: 'http.path'
185185
lokiSearch:
186186
datasourceUid: 'loki'
187-
{{- if ($team | get "azureMonitor" ($v | get "azure.monitor" nil)) }}
188-
- {{- tpl (readFile "../helmfile.d/snippets/azure-monitor.gotmpl") ($team | get "azureMonitor" ($v | get "azure.monitor")) | toString | nindent 14 }}
189-
{{- end }}
190187
{{- if has "msteams" ($team | get "alerts.receivers" list) }}
191188
- name: prometheus-msteams-{{ $teamId }}
192189
installed: {{ $team | get "managedMonitoring.prometheus" false }}

helmfile.d/snippets/azure-monitor.gotmpl

-19
This file was deleted.

tests/fixtures/env/cluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ cluster:
55
k8sContext: otomi-eks-demo
66
name: demo
77
owner: redkubes
8-
provider: linode
8+
provider: azure
99
region: eu-central-1

values-changes.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,5 @@ changes:
149149
- 'apps.prometheus.remoteWrite.otomiThanos'
150150
- 'apps.ingress-azure'
151151
- 'otomi.hasCloudLB'
152+
- 'monitor'
153+
- 'azureMonitor'

values-schema.yaml

-46
Original file line numberDiff line numberDiff line change
@@ -212,47 +212,6 @@ definitions:
212212
- AzureChinaCloud
213213
- AzureUSGovernment
214214
- AzureGermanCloud
215-
monitor:
216-
additionalProperties: false
217-
properties:
218-
appInsightsApiKey:
219-
$ref: '#/definitions/azure/definitions/clientSecret'
220-
title: AppInsights api key
221-
description: An Azure AppInsights client secret.
222-
appInsightsAppId:
223-
$ref: '#/definitions/azure/definitions/clientId'
224-
title: AppInsights app id
225-
azureLogAnalyticsSameAs:
226-
title: LogAnalytics using same creds?
227-
type: boolean
228-
default: true
229-
clientId:
230-
$ref: '#/definitions/azure/definitions/clientId'
231-
clientSecret:
232-
$ref: '#/definitions/azure/definitions/clientSecret'
233-
logAnalyticsClientId:
234-
$ref: '#/definitions/azure/definitions/clientId'
235-
title: LogAnalytics client id
236-
description: An Azure client secret.
237-
logAnalyticsClientSecret:
238-
$ref: '#/definitions/azure/definitions/clientSecret'
239-
title: LogAnalytics client secret
240-
description: An Azure client secret.
241-
logAnalyticsTenantId:
242-
$ref: '#/definitions/azure/definitions/tenantId'
243-
title: LogAnalytics tenant id
244-
description: An Azure tenant id.
245-
logAnalyticsDefaultWorkspace:
246-
title: LogAnalytics default workspace to show
247-
description: An Azure LogAnalytics workspace.
248-
type: string
249-
subscriptionId:
250-
$ref: '#/definitions/azure/definitions/subscriptionId'
251-
tenantId:
252-
$ref: '#/definitions/azure/definitions/tenantId'
253-
required:
254-
- clientId
255-
- clientSecret
256215
tenantId:
257216
title: Azure tenant id
258217
description: An Azure tenant id.
@@ -1175,8 +1134,6 @@ definitions:
11751134
properties:
11761135
shortcuts:
11771136
$ref: '#/definitions/shortcuts'
1178-
azureMonitor:
1179-
$ref: '#/definitions/azure/definitions/monitor'
11801137
backups:
11811138
type: array
11821139
items:
@@ -1679,9 +1636,6 @@ properties:
16791636
default: false
16801637
description: Indicates Azure Application Gateway Ingress Controller add-on is installed by AKS.
16811638
type: boolean
1682-
monitor:
1683-
$ref: '#/definitions/azure/definitions/monitor'
1684-
16851639
cloud:
16861640
additionalProperties: true
16871641
properties:

values/prometheus-operator/prometheus-operator.gotmpl

-3
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ grafana:
302302
datasourceUid: 'loki'
303303
{{- end }}
304304
{{- end }}
305-
{{- if $v | get "azure.monitor" nil }}
306-
- {{- tpl (readFile "../../helmfile.d/snippets/azure-monitor.gotmpl") $v.azure.monitor | toString | nindent 6 }}
307-
{{- end }}
308305
adminPassword: {{ $g | get "adminPassword" $v.otomi.adminPassword }}
309306
grafana.ini: {{- $grafanaIni | nindent 4 }}
310307
server:

0 commit comments

Comments
 (0)