diff --git a/TODO b/TODO index c7288435..99e22295 100644 --- a/TODO +++ b/TODO @@ -25,3 +25,4 @@ docs: where to store talosconfig how to version helm charts autombump chart versions for system charts recursive namespace deletion +move icons to repo diff --git a/packages/apps/monitoring-hub/Chart.yaml b/packages/apps/monitoring-hub/Chart.yaml index cd176a5a..36f1b54c 100644 --- a/packages/apps/monitoring-hub/Chart.yaml +++ b/packages/apps/monitoring-hub/Chart.yaml @@ -1,2 +1,6 @@ +apiVersion: v2 name: monitoring-hub -version: 0.0.0 +description: Monitoring and observability stack +icon: https://www.svgrepo.com/download/184787/analytics-laptop.svg +type: application +version: 0.1.1 diff --git a/packages/apps/monitoring-hub/templates/dashboards.yaml b/packages/apps/monitoring-hub/templates/dashboards.yaml index d975f187..cb5b26b1 100644 --- a/packages/apps/monitoring-hub/templates/dashboards.yaml +++ b/packages/apps/monitoring-hub/templates/dashboards.yaml @@ -5,7 +5,7 @@ apiVersion: grafana.integreatly.org/v1beta1 kind: GrafanaDashboard metadata: name: {{ $parts._0 }}-{{ $parts._1 }} - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: folder: {{ $parts._0 }} instanceSelector: diff --git a/packages/apps/monitoring-hub/templates/grafana-datasource-longterm.yaml b/packages/apps/monitoring-hub/templates/grafana-datasource-longterm.yaml index bce7434d..b2db94f8 100644 --- a/packages/apps/monitoring-hub/templates/grafana-datasource-longterm.yaml +++ b/packages/apps/monitoring-hub/templates/grafana-datasource-longterm.yaml @@ -11,7 +11,7 @@ spec: name: vm-longterm type: prometheus access: proxy - url: http://vmselect-vmcluster-longterm.cozy-monitoring-hub.svc:8481/longterm/select/0/prometheus/ + url: http://vmselect-vmcluster-longterm.{{ .Release.Namespace }}.svc:8481/longterm/select/0/prometheus/ isDefault: false jsonData: 'tlsSkipVerify': true diff --git a/packages/apps/monitoring-hub/templates/grafana-datasource.yaml b/packages/apps/monitoring-hub/templates/grafana-datasource.yaml index 2a381d47..a417236e 100644 --- a/packages/apps/monitoring-hub/templates/grafana-datasource.yaml +++ b/packages/apps/monitoring-hub/templates/grafana-datasource.yaml @@ -11,7 +11,7 @@ spec: name: vm type: prometheus access: proxy - url: http://vmselect-vmcluster.cozy-monitoring-hub.svc:8481/select/0/prometheus/ + url: http://vmselect-vmcluster.{{ .Release.Namespace }}.svc:8481/select/0/prometheus/ isDefault: true jsonData: 'tlsSkipVerify': true diff --git a/packages/apps/monitoring-hub/templates/vmalert-scrape.yaml b/packages/apps/monitoring-hub/templates/vmalert-scrape.yaml index 060dcee4..326acbde 100644 --- a/packages/apps/monitoring-hub/templates/vmalert-scrape.yaml +++ b/packages/apps/monitoring-hub/templates/vmalert-scrape.yaml @@ -3,7 +3,7 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMServiceScrape metadata: name: vmalert-vmalert - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: endpoints: - path: /metrics diff --git a/packages/apps/monitoring-hub/templates/vmalert.yaml b/packages/apps/monitoring-hub/templates/vmalert.yaml index 7aada4e0..f993ff67 100644 --- a/packages/apps/monitoring-hub/templates/vmalert.yaml +++ b/packages/apps/monitoring-hub/templates/vmalert.yaml @@ -2,18 +2,18 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMAlert metadata: name: vmalert - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: datasource: - url: http://vmselect-vmcluster.cozy-monitoring-hub.svc:8481/select/0/prometheus + url: http://vmselect-vmcluster.{{ .Release.Namespace }}.svc:8481/select/0/prometheus evaluationInterval: 15s extraArgs: remoteWrite.disablePathAppend: "true" notifiers: - - url: http://vmalertmanager-alertmanager.cozy-monitoring-hub.svc:9093 + - url: http://vmalertmanager-alertmanager.{{ .Release.Namespace }}.svc:9093 remoteRead: - url: http://vmselect-vmcluster.cozy-monitoring-hub.svc:8481/select/0/prometheus + url: http://vmselect-vmcluster.{{ .Release.Namespace }}.svc:8481/select/0/prometheus remoteWrite: - url: http://vminsert-vmcluster.cozy-monitoring-hub.svc:8480/insert/0/prometheus/api/v1/write + url: http://vminsert-vmcluster.{{ .Release.Namespace }}.svc:8480/insert/0/prometheus/api/v1/write resources: {} selectAllByDefault: true diff --git a/packages/apps/monitoring-hub/templates/vmalertmanager.yaml b/packages/apps/monitoring-hub/templates/vmalertmanager.yaml index 0fc7f378..d41971ac 100644 --- a/packages/apps/monitoring-hub/templates/vmalertmanager.yaml +++ b/packages/apps/monitoring-hub/templates/vmalertmanager.yaml @@ -18,7 +18,7 @@ stringData: receivers: - name: 'webhook' webhook_configs: - - url: http://grafana-oncall-engine.cozy-monitoring-hub.svc:8080/integrations/v1/alertmanager/Kjb2NWxxSlgGtxz9F4ihovQBB/ + - url: http://grafana-oncall-engine.{{ .Release.Namespace }}.svc:8080/integrations/v1/alertmanager/Kjb2NWxxSlgGtxz9F4ihovQBB/ --- apiVersion: operator.victoriametrics.com/v1beta1 kind: VMAlertmanager diff --git a/packages/apps/monitoring-hub/templates/vmcluster-longterm-scrape.yaml b/packages/apps/monitoring-hub/templates/vmcluster-longterm-scrape.yaml index bf1e0702..a3fd91b7 100644 --- a/packages/apps/monitoring-hub/templates/vmcluster-longterm-scrape.yaml +++ b/packages/apps/monitoring-hub/templates/vmcluster-longterm-scrape.yaml @@ -3,7 +3,7 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMServiceScrape metadata: name: vmstorage-vmcluster-longterm - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: endpoints: - path: /metrics diff --git a/packages/apps/monitoring-hub/templates/vmcluster-longterm.yaml b/packages/apps/monitoring-hub/templates/vmcluster-longterm.yaml index e32b28cf..f5ec52c2 100644 --- a/packages/apps/monitoring-hub/templates/vmcluster-longterm.yaml +++ b/packages/apps/monitoring-hub/templates/vmcluster-longterm.yaml @@ -2,7 +2,7 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMCluster metadata: name: vmcluster-longterm - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: replicationFactor: 2 retentionPeriod: "14" diff --git a/packages/apps/monitoring-hub/templates/vmcluster-scrape.yaml b/packages/apps/monitoring-hub/templates/vmcluster-scrape.yaml index e781b0ff..3e72c611 100644 --- a/packages/apps/monitoring-hub/templates/vmcluster-scrape.yaml +++ b/packages/apps/monitoring-hub/templates/vmcluster-scrape.yaml @@ -3,7 +3,7 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMServiceScrape metadata: name: vminsert-vmcluster - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: endpoints: - path: /metrics diff --git a/packages/apps/monitoring-hub/templates/vmcluster.yaml b/packages/apps/monitoring-hub/templates/vmcluster.yaml index d95c2950..286cc0d3 100644 --- a/packages/apps/monitoring-hub/templates/vmcluster.yaml +++ b/packages/apps/monitoring-hub/templates/vmcluster.yaml @@ -2,7 +2,7 @@ apiVersion: operator.victoriametrics.com/v1beta1 kind: VMCluster metadata: name: vmcluster - namespace: cozy-monitoring-hub + namespace: {{ .Release.Namespace }} spec: replicationFactor: 2 retentionPeriod: "3" diff --git a/packages/apps/monitoring-hub/values.yaml b/packages/apps/monitoring-hub/values.yaml index 1aade8e4..83852641 100644 --- a/packages/apps/monitoring-hub/values.yaml +++ b/packages/apps/monitoring-hub/values.yaml @@ -1,11 +1,3 @@ -_helm: - name: monitoring-hub - namespace: cozy-monitoring-hub - createNamespace: true - dependsOn: - - name: grafana-operator - - name: postgres-operator - adminPassword: Moh4ooN9phaech6Sai9aoGiezu4doh2i # TODO oncall: diff --git a/packages/apps/versions_map b/packages/apps/versions_map index e47790f9..9b454742 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -1,6 +1,7 @@ http-balancer 0.1.0 HEAD kubernetes 0.1.0 HEAD -monitoring-hub 0.0.0 HEAD +monitoring-hub 0.0.0 44a755d +monitoring-hub 0.1.1 HEAD mysql 0.1.0 HEAD postgres 0.1.0 HEAD rabbitmq 0.1.0 HEAD