Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

L3 231/add monitoring #49

Merged
merged 11 commits into from
Apr 22, 2024
Merged

L3 231/add monitoring #49

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
63b9fc3
Add kube-prometheus-stack monitoring
msterle Apr 5, 2024
9ec8ea8
Add bob and charlie, fix metric labels
msterle Apr 5, 2024
4e09290
add monitoring dependency to alice, bob, charlie and nginx
msterle Apr 19, 2024
99baffa
Merge branch 'main' into L3-231/add-monitoring
msterle Apr 19, 2024
63099d2
fix dependson
msterle Apr 19, 2024
8de2133
move nginx back to kube-system namespace on kind cluster
msterle Apr 22, 2024
e08010d
reduced sync intervals for monitoring on kind cluster
msterle Apr 22, 2024
1320b1d
remove scripts to suspend/resume flux resources
msterle Apr 22, 2024
080dcb8
add comment on how to configure the kube-state-metrics chart
msterle Apr 22, 2024
c61a000
move back to tracking main branch
msterle Apr 22, 2024
f9e0935
Update clusters/kind-cluster/monitoring/release.yaml
msterle Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions clusters/kind-cluster/alice/sqnc-identity-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
10 changes: 10 additions & 0 deletions clusters/kind-cluster/alice/sqnc-matchmaker-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
3 changes: 3 additions & 0 deletions clusters/kind-cluster/alice/sqnc-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ node:
- "--unsafe-rpc-external"
- "--alice"
- "--prometheus-external"
serviceMonitor:
enabled: true
namespace: monitoring
storageClass: standard
24 changes: 23 additions & 1 deletion clusters/kind-cluster/base/app-sync.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ spec:
interval: 1m
path: ./clusters/kind-cluster/alice
prune: true
dependsOn:
- name: monitoring-sync
sourceRef:
kind: GitRepository
name: flux-system
Expand All @@ -22,6 +24,8 @@ spec:
interval: 1m
path: ./clusters/kind-cluster/bob
prune: true
dependsOn:
- name: monitoring-sync
sourceRef:
kind: GitRepository
name: flux-system
Expand All @@ -36,6 +40,8 @@ spec:
interval: 1m
path: ./clusters/kind-cluster/charlie
prune: true
dependsOn:
- name: monitoring-sync
sourceRef:
kind: GitRepository
name: flux-system
Expand All @@ -45,11 +51,27 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: nginx-sync
namespace: kube-system
namespace: sqnc
dblane-digicatapult marked this conversation as resolved.
Show resolved Hide resolved
spec:
interval: 1m
path: ./clusters/kind-cluster/nginx
prune: true
dependsOn:
- name: monitoring-sync
sourceRef:
kind: GitRepository
name: flux-system
namespace: flux-system
---
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: monitoring-sync
namespace: monitoring
spec:
interval: 1m
path: ./clusters/kind-cluster/monitoring
prune: true
sourceRef:
kind: GitRepository
name: flux-system
Expand Down
2 changes: 1 addition & 1 deletion clusters/kind-cluster/base/flux-system/gotk-sync.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
interval: 1m0s
ref:
branch: main
branch: L3-231/add-monitoring
url: https://github.com/digicatapult/sqnc-flux-infra.git

---
Expand Down
16 changes: 16 additions & 0 deletions clusters/kind-cluster/base/namespaces.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,24 @@ metadata:
---
apiVersion: v1
kind: Namespace
metadata:
labels:
app.kubernetes.io/instance: sqnc
app.kubernetes.io/version: latest
name: sqnc
dblane-digicatapult marked this conversation as resolved.
Show resolved Hide resolved
---
apiVersion: v1
kind: Namespace
metadata:
labels:
app.kubernetes.io/instance: sqnc
app.kubernetes.io/version: latest
name: keycloak
---
apiVersion: v1
kind: Namespace
metadata:
name: monitoring
labels:
app.kubernetes.io/component: monitoring
pod-security.kubernetes.io/enforce: privileged
10 changes: 10 additions & 0 deletions clusters/kind-cluster/bob/sqnc-identity-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
10 changes: 10 additions & 0 deletions clusters/kind-cluster/bob/sqnc-matchmaker-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
3 changes: 3 additions & 0 deletions clusters/kind-cluster/bob/sqnc-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ node:
- "--bob"
- "--prometheus-external"
- "--bootnodes '/dns4/alice-node-sqnc-node-0-rc-p2p.alice.svc.cluster.local/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp'"
serviceMonitor:
enabled: true
namespace: monitoring
storageClass: standard
10 changes: 10 additions & 0 deletions clusters/kind-cluster/charlie/sqnc-identity-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
10 changes: 10 additions & 0 deletions clusters/kind-cluster/charlie/sqnc-matchmaker-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,13 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /$1
node:
enabled: false
postgresql:
metrics:
enabled: true
serviceMonitor:
enabled: true
namespace: monitoring
relabelings:
- action: replace
sourceLabels: [namespace]
targetLabel: kubernetes_namespace
3 changes: 3 additions & 0 deletions clusters/kind-cluster/charlie/sqnc-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ node:
- "--charlie"
- "--prometheus-external"
- "--bootnodes '/dns4/alice-node-sqnc-node-0-rc-p2p.alice.svc.cluster.local/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp'"
serviceMonitor:
enabled: true
namespace: monitoring
storageClass: standard