Skip to content

Commit cc5dec2

Browse files
author
Diego Luisi
committed
⚡ - fix
1 parent 4036ab2 commit cc5dec2

3 files changed

Lines changed: 27 additions & 38 deletions

File tree

apps/grafana/base/kustomization.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,5 +450,3 @@ helmCharts:
450450
nodejs-applications:
451451
datasource: Prometheus
452452
gnetId: 19062
453-
454-

apps/otel-collector/base/service-monitor.yaml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spec:
1515
matchLabels:
1616
app.kubernetes.io/name: otel-collector
1717
endpoints:
18-
- port: prometheus #tcp-node
19-
path: /metrics
20-
scheme: http
21-
interval: 30s
22-
honorLabels: true
18+
- port: prometheus #tcp-node
19+
path: /metrics
20+
scheme: http
21+
interval: 30s
22+
honorLabels: true
2323

2424
---
2525
apiVersion: monitoring.coreos.com/v1
@@ -39,17 +39,8 @@ spec:
3939
matchLabels:
4040
app.kubernetes.io/name: otel-collector-monitoring
4141
endpoints:
42-
- port: monitoring
43-
path: /metrics
44-
scheme: http
45-
interval: 60s
46-
honorLabels: true
47-
48-
# - job_name: "otel-collector"
49-
# honor_labels: true
50-
# metrics_path: /metrics
51-
# scrape_interval: 30s
52-
# static_configs:
53-
# - targets:
54-
# - otel-collector.observability.svc.cluster.local:8889 # Traces
55-
# - otel-collector-monitoring.observability.svc.cluster.local:8888 # Service Monitor
42+
- port: monitoring
43+
path: /metrics
44+
scheme: http
45+
interval: 60s
46+
honorLabels: true

bootstrap/argo-cd/kustomization.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,34 @@ patches:
5454
configMapGenerator:
5555
- behavior: merge
5656
literals:
57-
- server.insecure="true"
58-
- dexserver.disable.tls="true"
59-
- server.dex.server="http://argocd-dex-server:5556"
60-
- server.dex.server.strict.tls="false"
57+
- server.insecure="true"
58+
- dexserver.disable.tls="true"
59+
- server.dex.server="http://argocd-dex-server:5556"
60+
- server.dex.server.strict.tls="false"
6161
name: argocd-cmd-params-cm
6262
- behavior: merge
6363
files:
64-
- files/dex.config
65-
- files/repositories
66-
- files/repository.credentials
67-
- files/resource.customizations
64+
- files/dex.config
65+
- files/repositories
66+
- files/repository.credentials
67+
- files/resource.customizations
6868
literals:
69-
- admin.enabled=true
70-
- kustomize.buildOptions="--enable-alpha-plugins --enable-helm --load-restrictor
71-
LoadRestrictionsNone"
72-
- statusbadge.enabled=true
73-
- url=https://argocd.devxp-tech.io
74-
- dexserver.disable.tls=true
75-
- accounts.backstage="apiKey, login"
69+
- admin.enabled=true
70+
- kustomize.buildOptions="--enable-alpha-plugins --enable-helm --load-restrictor
71+
LoadRestrictionsNone"
72+
- statusbadge.enabled=true
73+
- url=https://argocd.devxp-tech.io
74+
- dexserver.disable.tls=true
75+
- accounts.backstage="apiKey, login"
7676
name: argocd-cm
7777
options:
7878
labels:
7979
app.kubernetes.io/part-of: argocd
8080
- behavior: merge
8181
files:
82-
- files/policy.csv
82+
- files/policy.csv
8383
literals:
84-
- policy.default="role:readonly"
84+
- policy.default="role:readonly"
8585
name: argocd-rbac-cm
8686
options:
8787
labels:

0 commit comments

Comments
 (0)