Compare commits

...

2 commits

Author SHA1 Message Date
f63fdf7a28 Update image app-template to v3.5.0 2024-10-04 20:05:32 +00:00
3f08f41958
kps gettin the boot 2024-10-04 13:45:03 -05:00
39 changed files with 36 additions and 205 deletions

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -8,7 +8,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
interval: 30m interval: 30m
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -8,7 +8,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
interval: 30m interval: 30m
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -8,7 +8,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
interval: 30m interval: 30m
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -10,7 +10,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -10,7 +10,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
interval: 30m interval: 30m
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -1,146 +0,0 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: kube-prometheus-stack
spec:
interval: 30m
timeout: 15m
chart:
spec:
chart: kube-prometheus-stack
version: 65.0.0
sourceRef:
kind: HelmRepository
name: prometheus-community
namespace: flux-system
interval: 30m
install:
crds: Skip
upgrade:
crds: Skip
values:
crds:
enabled: false
cleanPrometheusOperatorObjectNames: true
###
### Component values
###
alertmanager:
enabled: false
kubeApiServer:
enabled: true
serviceMonitor:
metricRelabelings:
# Drop high cardinality labels
- action: drop
sourceLabels: ["__name__"]
regex: (apiserver|etcd|rest_client)_request(|_sli|_slo)_duration_seconds_bucket
- action: drop
sourceLabels: ["__name__"]
regex: (apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket)
kubeControllerManager:
enabled: false
kubeEtcd:
enabled: false
kubelet:
enabled: true
serviceMonitor:
metricRelabelings:
# Drop high cardinality labels
- action: labeldrop
regex: (uid)
- action: labeldrop
regex: (id|name)
- action: drop
sourceLabels: ["__name__"]
regex: (rest_client_request_duration_seconds_bucket|rest_client_request_duration_seconds_sum|rest_client_request_duration_seconds_count)
kubeProxy:
enabled: false
kubeScheduler:
enabled: false
kubeStateMetrics:
enabled: false
nodeExporter:
enabled: false
grafana:
enabled: false
forceDeployDashboards: true
sidecar:
dashboards:
annotations:
grafana_folder: Kubernetes
###
### Prometheus operator values
###
prometheusOperator:
resources:
requests:
cpu: 35m
memory: 273M
limits:
memory: 326M
prometheusConfigReloader:
# resource config for prometheusConfigReloader
resources:
requests:
cpu: 5m
memory: 32M
limits:
memory: 32M
###
### Prometheus instance values
###
prometheus:
ingress:
enabled: true
ingressClassName: internal-nginx
annotations:
external-dns.alpha.kubernetes.io/target: internal.jahanson.tech
hosts:
- prometheus.jahanson.tech
pathType: Prefix
prometheusSpec:
enableAdminAPI: true
enableFeatures:
- auto-gomaxprocs
- memory-snapshot-on-shutdown
- new-service-discovery-manager
podMonitorSelectorNilUsesHelmValues: false
probeSelectorNilUsesHelmValues: false
replicas: 1
replicaExternalLabelName: "__replica__" # must match with thanos value `.query.replicaLabel[0]`
resources:
requests:
cpu: 100m
limits:
memory: 1500M
retention: 14d
retentionSize: 50GB
ruleSelectorNilUsesHelmValues: false
scrapeConfigSelectorNilUsesHelmValues: false
scrapeInterval: 1m # Must match interval in Grafana Helm chart
serviceMonitorSelectorNilUsesHelmValues: false
storageSpec:
volumeClaimTemplate:
spec:
storageClassName: ceph-block
resources:
requests:
storage: 55Gi
walCompression: true

View file

@ -1,22 +0,0 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &appname kube-prometheus-stack
namespace: flux-system
spec:
targetNamespace: observability
commonMetadata:
labels:
app.kubernetes.io/name: *appname
interval: 10m
path: "./kubernetes/apps/observability/kube-prometheus-stack/app"
prune: true
sourceRef:
kind: GitRepository
name: theshire
wait: true
dependsOn:
# - name: alertmanager
- name: rook-ceph-cluster

View file

@ -6,6 +6,5 @@ resources:
# Pre Flux-Kustomizations # Pre Flux-Kustomizations
- ./namespace.yaml - ./namespace.yaml
# Flux-Kustomizations # Flux-Kustomizations
- ./kube-prometheus-stack/ks.yaml
- ./prometheus-operator-crds/ks.yaml - ./prometheus-operator-crds/ks.yaml
- ./gatus/ks.yaml - ./gatus/ks.yaml

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -10,7 +10,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
interval: 30m interval: 30m
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: app-template chart: app-template
version: 3.4.0 version: 3.5.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: bjw-s name: bjw-s