Skip to content

Commit

Permalink
Added Observability (#63)
Browse files Browse the repository at this point in the history
* Added observability and refined software patterns.

* Created new template.
  • Loading branch information
danielscholl authored Mar 29, 2024
1 parent ee886e3 commit 4fb96c4
Show file tree
Hide file tree
Showing 27 changed files with 366 additions and 39 deletions.
6 changes: 3 additions & 3 deletions azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.25.53.49325",
"templateHash": "1742375222510409189"
"templateHash": "11024930103990666202"
}
},
"parameters": {
Expand Down Expand Up @@ -19612,7 +19612,7 @@
"_generator": {
"name": "bicep",
"version": "0.25.53.49325",
"templateHash": "15671377249001846937"
"templateHash": "14969289225659282468"
}
},
"definitions": {
Expand Down Expand Up @@ -19824,7 +19824,7 @@
"name": "flux-system",
"url": "[if(equals(parameters('softwareRepository'), ''), 'https://github.com/azure/osdu-developer', parameters('softwareRepository'))]",
"branch": "[if(equals(parameters('softwareBranch'), ''), '', parameters('softwareBranch'))]",
"tag": "[if(and(equals(parameters('softwareTag'), ''), equals(parameters('softwareBranch'), '')), 'v0.5.0', parameters('softwareTag'))]",
"tag": "[if(and(equals(parameters('softwareTag'), ''), equals(parameters('softwareBranch'), '')), 'v0.6.0', parameters('softwareTag'))]",
"components": "./stamp/components",
"applications": "./stamp/applications"
},
Expand Down
2 changes: 1 addition & 1 deletion bicep/modules/blade_service.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ var serviceLayerConfig = {
name: 'flux-system'
url: softwareRepository == '' ? 'https://github.com/azure/osdu-developer' : softwareRepository
branch: softwareBranch == '' ? '' : softwareBranch
tag: softwareTag == '' && softwareBranch == '' ? 'v0.5.0' : softwareTag
tag: softwareTag == '' && softwareBranch == '' ? 'v0.6.0' : softwareTag
components: './stamp/components'
applications: './stamp/applications'
}
Expand Down
5 changes: 5 additions & 0 deletions software/applications/monitoring/jaeger.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: jaegertracing.io/v1
kind: Jaeger
metadata:
name: tracing
namespace: monitoring
44 changes: 44 additions & 0 deletions software/applications/monitoring/kiali.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: kiali.io/v1alpha1
kind: Kiali
metadata:
name: kiali
namespace: monitoring
spec:
istio_namespace: aks-istio-system
auth:
strategy: anonymous
deployment:
ingress:
enabled: false
namespace: monitoring
logger:
log_level: info
server:
profiler:
enabled: false
external_services:
istio:
root_namespace: aks-istio-system
config_map_name: istio-asm-1-19
istio_sidecar_injector_config_map_name: istio-sidecar-injector-asm-1-19
istiod_deployment_name: istiod-asm-1-19
component_status:
enabled: true
components:
- app_label: aks-istio-ingressgateway-internal
is_core: true
is_proxy: true
namespace: aks-istio-ingress
- app_label: aks-istio-ingressgateway-external
is_core: true
is_proxy: true
namespace: aks-istio-ingress
grafana:
in_cluster_url: http://prometheus-operator-grafana.monitoring.svc:80
url: http://prometheus-operator-grafana.monitoring.svc:80
prometheus:
in_cluster_url: http://prometheus-operated.monitoring.svc:9090
url: http://prometheus-operated.monitoring.svc:9090
tracing:
in_cluster_url: http://tracing-query.monitoring.svc:16686
url: http://tracing-query.monitoring.svc:16686
2 changes: 1 addition & 1 deletion software/applications/osdu-azure/entitlement-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
port: 80
configuration:
- service: entitlements
repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/entitlements/entitlements-azure-m18-master
repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/entitlements/entitlements-release-0-22
tag: latest
path: /api/entitlements/v2/*
probe:
Expand Down
2 changes: 1 addition & 1 deletion software/applications/osdu-azure/file-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
port: 80
configuration:
- service: file
repository: community.opengroup.org:5555/osdu/platform/system/file/file-azure-m18-master
repository: community.opengroup.org:5555/osdu/platform/system/file/file-release-0-22
tag: latest
path: /api/file/*
probe:
Expand Down
2 changes: 1 addition & 1 deletion software/applications/osdu-azure/legal-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
port: 80
configuration:
- service: legal
repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/legal/legal-azure-m18-master
repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/legal/legal-release-0-22
tag: latest
path: /api/legal/v1/*
probe:
Expand Down
2 changes: 1 addition & 1 deletion software/applications/osdu-azure/partition-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
port: 80
configuration:
- service: partition
repository: community.opengroup.org:5555/osdu/platform/system/partition/partition-azure-m18-master
repository: community.opengroup.org:5555/osdu/platform/system/partition/partition-release-0-22
tag: latest
path: /api/partition/v1/*
probe:
Expand Down
3 changes: 2 additions & 1 deletion software/applications/osdu-azure/schema-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ spec:
port: 80
configuration:
- service: schema
repository: community.opengroup.org:5555/osdu/platform/system/schema-service/schema-service-azure-m18-master
# repository: community.opengroup.org:5555/osdu/platform/system/schema-service/schema-service-azure-m18-master
repository: community.opengroup.org:5555/osdu/platform/system/schema-service/schema-service-release-0-22
tag: latest
path: /api/schema-service/v1/*
probe:
Expand Down
1 change: 1 addition & 0 deletions software/applications/osdu-azure/storage-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
# configuration:
# - service: storage
# repository: community.opengroup.org:5555/osdu/platform/system/storage/storage-azure-m18-master
# repository: community.opengroup.org:5555/osdu/platform/system/storage/storage-release-0-22
# tag: latest
# path: /api/storage/v2/*
# probe:
Expand Down
1 change: 1 addition & 0 deletions software/applications/podinfo/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ spec:
sourceRef:
kind: HelmRepository
name: podinfo
namespace: flux-system
interval: 50m
install:
remediation:
Expand Down
2 changes: 1 addition & 1 deletion software/applications/podinfo/source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: podinfo
namespace: podinfo
namespace: flux-system
spec:
interval: 5m
url: https://stefanprodan.github.io/podinfo
7 changes: 7 additions & 0 deletions software/components/airflow/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: airflow
labels:
toolkit.fluxcd.io/tenant: sre-team
8 changes: 8 additions & 0 deletions software/components/airflow/source.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: airflow
namespace: flux-system
spec:
interval: 30m
url: https://airflow.apache.org
2 changes: 1 addition & 1 deletion software/components/cert-manager/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
sourceRef:
kind: HelmRepository
name: cert-manager
namespace: cert-manager
namespace: flux-system
interval: 12h
values:
installCRDs: true
2 changes: 1 addition & 1 deletion software/components/cert-manager/source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: cert-manager
namespace: cert-manager
namespace: flux-system
spec:
interval: 24h
url: https://charts.jetstack.io
2 changes: 1 addition & 1 deletion software/components/elastic-operator/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
sourceRef:
kind: GitRepository
name: elastic-operator
namespace: elastic-system
namespace: flux-system
interval: 12h
# values:
# podLabels:
Expand Down
2 changes: 1 addition & 1 deletion software/components/elastic-operator/source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: GitRepository
metadata:
name: elastic-operator
namespace: elastic-system
namespace: flux-system
spec:
interval: 5m
url: https://github.com/elastic/cloud-on-k8s
Expand Down
7 changes: 7 additions & 0 deletions software/components/monitoring/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: monitoring
labels:
toolkit.fluxcd.io/tenant: sre-team
96 changes: 96 additions & 0 deletions software/components/monitoring/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: prometheus-operator
namespace: monitoring
spec:
releaseName: prometheus-operator
chart:
spec:
chart: kube-prometheus-stack
sourceRef:
kind: HelmRepository
name: prometheus
namespace: flux-system
interval: 1h0m0s
install:
remediation:
retries: 3
values:
alertmanager:
alertmanagerSpec:
tolerations:
- effect: NoSchedule
key: app
value: "cluster"
prometheusOperator:
tolerations:
- effect: NoSchedule
key: app
value: "cluster"
kube-state-metrics:
tolerations:
- effect: NoSchedule
key: app
value: "cluster"
grafana:
tolerations:
- effect: NoSchedule
key: app
value: "cluster"
grafana.ini:
auth.anonymous:
enabled: true
org_name: Main Org.
org_role: Editor
auth:
disable_login_form: true
prometheus:
prometheusSpec:
tolerations:
- effect: NoSchedule
key: app
value: "cluster"
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: jaeger-operator
namespace: monitoring
spec:
releaseName: jaeger-operator
chart:
spec:
chart: jaeger-operator
sourceRef:
kind: HelmRepository
name: jaeger
namespace: flux-system
interval: 1h0m0s
install:
remediation:
retries: 3
---
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: kiali-operator
namespace: monitoring
spec:
releaseName: kiali-operator
chart:
spec:
chart: kiali-operator
sourceRef:
kind: HelmRepository
name: kiali
namespace: flux-system
interval: 1h0m0s
install:
remediation:
retries: 3
values:
image:
repo: quay.io/kiali/kiali-operator
tag: latest
27 changes: 27 additions & 0 deletions software/components/monitoring/source.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: prometheus
namespace: flux-system
spec:
interval: 30m
url: https://prometheus-community.github.io/helm-charts
---
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: jaeger
namespace: flux-system
spec:
interval: 30m
url: https://jaegertracing.github.io/helm-charts
---
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: kiali
namespace: flux-system
spec:
interval: 30m
url: https://kiali.org/helm-charts
2 changes: 1 addition & 1 deletion software/components/redis-cache/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
sourceRef:
kind: HelmRepository
name: redis
namespace: redis-cache
namespace: flux-system
install:
remediation:
retries: 3
Expand Down
2 changes: 1 addition & 1 deletion software/components/redis-cache/source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: redis
namespace: redis-cache
namespace: flux-system
spec:
interval: 10m
url: https://charts.bitnami.com/bitnami
Expand Down
Loading

0 comments on commit 4fb96c4

Please sign in to comment.