Remove deprecated monitoring configs
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
@@ -1,13 +1,15 @@
|
|||||||
# :warning: Deprecation Notice
|
# :warning: Removal Notice
|
||||||
|
|
||||||
Starting Flux v2.1.0, released August 24, 2023, the Flux monitoring
|
Starting Flux v2.1.0, released August 24, 2023, the Flux monitoring
|
||||||
configurations in this repository will be marked as deprecated. New monitoring
|
configurations in this repository were marked as deprecated. The new monitoring
|
||||||
docs are available at [Flux monitoring](https://fluxcd.io/flux/monitoring/)
|
docs are available at [Flux monitoring](https://fluxcd.io/flux/monitoring/)
|
||||||
docs with new example configurations in
|
docs with new example configurations in
|
||||||
[fluxcd/flux2-monitoring-example](https://github.com/fluxcd/flux2-monitoring-example/).
|
[fluxcd/flux2-monitoring-example](https://github.com/fluxcd/flux2-monitoring-example/).
|
||||||
The deprecated configurations will be removed in a future release of Flux. All
|
|
||||||
users of these configurations are recommended to use the new monitoring setup,
|
The deprecated configurations were removed in Flux v2.2 on December 13, 2023. All
|
||||||
following the docs and the new examples.
|
users of these configurations are advised to use the new monitoring setup,
|
||||||
|
following the [docs](https://fluxcd.io/flux/monitoring/) and the
|
||||||
|
[examples](https://github.com/fluxcd/flux2-monitoring-example/).
|
||||||
|
|
||||||
After collecting a lot of user feedback about our monitoring recommendation, in
|
After collecting a lot of user feedback about our monitoring recommendation, in
|
||||||
order to serve most of the needs of the users, we decided to create a new
|
order to serve most of the needs of the users, we decided to create a new
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
namespace: monitoring
|
|
||||||
resources:
|
|
||||||
- namespace.yaml
|
|
||||||
- repository.yaml
|
|
||||||
- release.yaml
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: monitoring
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/component: monitoring
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
|
||||||
kind: HelmRelease
|
|
||||||
metadata:
|
|
||||||
name: kube-prometheus-stack
|
|
||||||
spec:
|
|
||||||
interval: 5m
|
|
||||||
chart:
|
|
||||||
spec:
|
|
||||||
version: "45.x"
|
|
||||||
chart: kube-prometheus-stack
|
|
||||||
sourceRef:
|
|
||||||
kind: HelmRepository
|
|
||||||
name: prometheus-community
|
|
||||||
interval: 60m
|
|
||||||
install:
|
|
||||||
crds: Create
|
|
||||||
upgrade:
|
|
||||||
crds: CreateReplace
|
|
||||||
# https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
|
|
||||||
values:
|
|
||||||
alertmanager:
|
|
||||||
enabled: false
|
|
||||||
prometheus:
|
|
||||||
prometheusSpec:
|
|
||||||
retention: 24h
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 200m
|
|
||||||
memory: 200Mi
|
|
||||||
podMonitorNamespaceSelector: {}
|
|
||||||
podMonitorSelector:
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/component: monitoring
|
|
||||||
postRenderers:
|
|
||||||
- kustomize:
|
|
||||||
patches:
|
|
||||||
- target:
|
|
||||||
# Ignore these objects from Flux diff as they are mutated from chart hooks
|
|
||||||
kind: (ValidatingWebhookConfiguration|MutatingWebhookConfiguration)
|
|
||||||
name: kube-prometheus-stack-admission
|
|
||||||
patch: |
|
|
||||||
- op: add
|
|
||||||
path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
|
|
||||||
value: disabled
|
|
||||||
- target:
|
|
||||||
# Ignore these objects from Flux diff as they are mutated at apply time but not at dry-run time
|
|
||||||
kind: PrometheusRule
|
|
||||||
patch: |
|
|
||||||
- op: add
|
|
||||||
path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
|
|
||||||
value: disabled
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
apiVersion: source.toolkit.fluxcd.io/v1beta2
|
|
||||||
kind: HelmRepository
|
|
||||||
metadata:
|
|
||||||
name: prometheus-community
|
|
||||||
spec:
|
|
||||||
interval: 120m
|
|
||||||
# OCI builds for kube-prometheus-stack have been temporarily disabled (see https://github.com/prometheus-community/helm-charts/issues/2940).
|
|
||||||
type: default
|
|
||||||
url: https://prometheus-community.github.io/helm-charts
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
namespace: monitoring
|
|
||||||
resources:
|
|
||||||
- repository.yaml
|
|
||||||
- release.yaml
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
|
||||||
kind: HelmRelease
|
|
||||||
metadata:
|
|
||||||
name: loki-stack
|
|
||||||
spec:
|
|
||||||
interval: 5m
|
|
||||||
dependsOn:
|
|
||||||
- name: kube-prometheus-stack
|
|
||||||
chart:
|
|
||||||
spec:
|
|
||||||
version: "2.x"
|
|
||||||
chart: loki-stack
|
|
||||||
sourceRef:
|
|
||||||
kind: HelmRepository
|
|
||||||
name: grafana-charts
|
|
||||||
interval: 60m
|
|
||||||
# https://github.com/grafana/helm-charts/blob/main/charts/loki-stack/values.yaml
|
|
||||||
# https://github.com/grafana/loki/blob/main/production/helm/loki/values.yaml
|
|
||||||
values:
|
|
||||||
grafana:
|
|
||||||
enabled: false
|
|
||||||
sidecar:
|
|
||||||
datasources:
|
|
||||||
enabled: true
|
|
||||||
maxLines: 1000
|
|
||||||
promtail:
|
|
||||||
enabled: true
|
|
||||||
loki:
|
|
||||||
enabled: true
|
|
||||||
isDefault: false
|
|
||||||
serviceMonitor:
|
|
||||||
enabled: true
|
|
||||||
additionalLabels:
|
|
||||||
app.kubernetes.io/part-of: kube-prometheus-stack
|
|
||||||
config:
|
|
||||||
chunk_store_config:
|
|
||||||
max_look_back_period: 0s
|
|
||||||
table_manager:
|
|
||||||
retention_deletes_enabled: true
|
|
||||||
retention_period: 12h
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
apiVersion: source.toolkit.fluxcd.io/v1beta2
|
|
||||||
kind: HelmRepository
|
|
||||||
metadata:
|
|
||||||
name: grafana-charts
|
|
||||||
spec:
|
|
||||||
interval: 120m0s
|
|
||||||
url: https://grafana.github.io/helm-charts
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,332 +0,0 @@
|
|||||||
{
|
|
||||||
"__inputs": [
|
|
||||||
{
|
|
||||||
"name": "DS_LOKI",
|
|
||||||
"label": "Loki",
|
|
||||||
"description": "",
|
|
||||||
"type": "datasource",
|
|
||||||
"pluginId": "loki",
|
|
||||||
"pluginName": "Loki"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"annotations": {
|
|
||||||
"list": [
|
|
||||||
{
|
|
||||||
"builtIn": 1,
|
|
||||||
"datasource": "-- Grafana --",
|
|
||||||
"enable": true,
|
|
||||||
"hide": true,
|
|
||||||
"iconColor": "rgba(0, 211, 255, 1)",
|
|
||||||
"name": "Annotations & Alerts",
|
|
||||||
"target": {
|
|
||||||
"limit": 100,
|
|
||||||
"matchAny": false,
|
|
||||||
"tags": [],
|
|
||||||
"type": "dashboard"
|
|
||||||
},
|
|
||||||
"type": "dashboard"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": {
|
|
||||||
"type": "datasource",
|
|
||||||
"uid": "grafana"
|
|
||||||
},
|
|
||||||
"enable": true,
|
|
||||||
"iconColor": "red",
|
|
||||||
"name": "flux events",
|
|
||||||
"target": {
|
|
||||||
"limit": 100,
|
|
||||||
"matchAny": false,
|
|
||||||
"tags": [
|
|
||||||
"flux"
|
|
||||||
],
|
|
||||||
"type": "tags"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"description": "Flux logs collected from Kubernetes, stored in Loki",
|
|
||||||
"editable": true,
|
|
||||||
"gnetId": null,
|
|
||||||
"graphTooltip": 0,
|
|
||||||
"id": 29,
|
|
||||||
"iteration": 1653748775696,
|
|
||||||
"links": [],
|
|
||||||
"liveNow": false,
|
|
||||||
"panels": [
|
|
||||||
{
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"description": "",
|
|
||||||
"fieldConfig": {
|
|
||||||
"defaults": {
|
|
||||||
"color": {
|
|
||||||
"mode": "palette-classic"
|
|
||||||
},
|
|
||||||
"custom": {
|
|
||||||
"axisLabel": "",
|
|
||||||
"axisPlacement": "auto",
|
|
||||||
"barAlignment": 0,
|
|
||||||
"drawStyle": "bars",
|
|
||||||
"fillOpacity": 0,
|
|
||||||
"gradientMode": "none",
|
|
||||||
"hideFrom": {
|
|
||||||
"legend": false,
|
|
||||||
"tooltip": false,
|
|
||||||
"viz": false
|
|
||||||
},
|
|
||||||
"lineInterpolation": "linear",
|
|
||||||
"lineWidth": 1,
|
|
||||||
"pointSize": 5,
|
|
||||||
"scaleDistribution": {
|
|
||||||
"type": "linear"
|
|
||||||
},
|
|
||||||
"showPoints": "auto",
|
|
||||||
"spanNulls": false,
|
|
||||||
"stacking": {
|
|
||||||
"group": "A",
|
|
||||||
"mode": "none"
|
|
||||||
},
|
|
||||||
"thresholdsStyle": {
|
|
||||||
"mode": "off"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mappings": [],
|
|
||||||
"thresholds": {
|
|
||||||
"mode": "absolute",
|
|
||||||
"steps": [
|
|
||||||
{
|
|
||||||
"color": "green",
|
|
||||||
"value": null
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"color": "red",
|
|
||||||
"value": 80
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"overrides": []
|
|
||||||
},
|
|
||||||
"gridPos": {
|
|
||||||
"h": 4,
|
|
||||||
"w": 24,
|
|
||||||
"x": 0,
|
|
||||||
"y": 0
|
|
||||||
},
|
|
||||||
"id": 4,
|
|
||||||
"options": {
|
|
||||||
"legend": {
|
|
||||||
"calcs": [],
|
|
||||||
"displayMode": "hidden",
|
|
||||||
"placement": "bottom"
|
|
||||||
},
|
|
||||||
"tooltip": {
|
|
||||||
"mode": "single",
|
|
||||||
"sort": "none"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"expr": "sum(count_over_time({namespace=~\"$namespace\", stream=~\"$stream\", app =~\"$controller\"} | json | __error__!=\"JSONParserErr\" | level=~\"$level\" |= \"$query\" [$__interval]))",
|
|
||||||
"instant": false,
|
|
||||||
"legendFormat": "Log count",
|
|
||||||
"range": true,
|
|
||||||
"refId": "A"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "timeseries"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"description": "Logs from services running in Kubernetes",
|
|
||||||
"gridPos": {
|
|
||||||
"h": 25,
|
|
||||||
"w": 24,
|
|
||||||
"x": 0,
|
|
||||||
"y": 4
|
|
||||||
},
|
|
||||||
"id": 2,
|
|
||||||
"options": {
|
|
||||||
"dedupStrategy": "numbers",
|
|
||||||
"enableLogDetails": false,
|
|
||||||
"prettifyLogMessage": true,
|
|
||||||
"showCommonLabels": false,
|
|
||||||
"showLabels": false,
|
|
||||||
"showTime": false,
|
|
||||||
"sortOrder": "Descending",
|
|
||||||
"wrapLogMessage": false
|
|
||||||
},
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"expr": "{namespace=~\"$namespace\", stream=~\"$stream\", app =~\"$controller\"} | json | __error__!=\"JSONParserErr\" | level=~\"$level\" |= \"$query\"",
|
|
||||||
"refId": "A"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "logs"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"refresh": "10s",
|
|
||||||
"schemaVersion": 36,
|
|
||||||
"style": "light",
|
|
||||||
"tags": [
|
|
||||||
"flux"
|
|
||||||
],
|
|
||||||
"templating": {
|
|
||||||
"list": [
|
|
||||||
{
|
|
||||||
"current": {
|
|
||||||
"selected": false,
|
|
||||||
"text": "",
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
"description": "String to search for",
|
|
||||||
"hide": 0,
|
|
||||||
"label": "Search Query",
|
|
||||||
"name": "query",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"selected": true,
|
|
||||||
"text": "",
|
|
||||||
"value": ""
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"query": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"type": "textbox"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allValue": "info|error",
|
|
||||||
"current": {
|
|
||||||
"selected": false,
|
|
||||||
"text": "All",
|
|
||||||
"value": "$__all"
|
|
||||||
},
|
|
||||||
"hide": 0,
|
|
||||||
"includeAll": true,
|
|
||||||
"multi": false,
|
|
||||||
"name": "level",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"selected": true,
|
|
||||||
"text": "All",
|
|
||||||
"value": "$__all"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"selected": false,
|
|
||||||
"text": "info",
|
|
||||||
"value": "info"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"selected": false,
|
|
||||||
"text": "error",
|
|
||||||
"value": "error"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"query": "info,error",
|
|
||||||
"queryValue": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"type": "custom"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allValue": ".+",
|
|
||||||
"current": {
|
|
||||||
"selected": true,
|
|
||||||
"text": [
|
|
||||||
"All"
|
|
||||||
],
|
|
||||||
"value": [
|
|
||||||
"$__all"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"definition": "label_values(app)",
|
|
||||||
"hide": 0,
|
|
||||||
"includeAll": true,
|
|
||||||
"multi": true,
|
|
||||||
"name": "controller",
|
|
||||||
"options": [],
|
|
||||||
"query": "label_values(app)",
|
|
||||||
"refresh": 1,
|
|
||||||
"regex": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"sort": 0,
|
|
||||||
"type": "query"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allValue": ".+",
|
|
||||||
"current": {
|
|
||||||
"selected": true,
|
|
||||||
"text": [
|
|
||||||
"flux-system"
|
|
||||||
],
|
|
||||||
"value": [
|
|
||||||
"flux-system"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"definition": "label_values(namespace)",
|
|
||||||
"hide": 0,
|
|
||||||
"includeAll": true,
|
|
||||||
"multi": true,
|
|
||||||
"name": "namespace",
|
|
||||||
"options": [],
|
|
||||||
"query": "label_values(namespace)",
|
|
||||||
"refresh": 1,
|
|
||||||
"regex": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"sort": 0,
|
|
||||||
"type": "query"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allValue": ".+",
|
|
||||||
"current": {
|
|
||||||
"selected": false,
|
|
||||||
"text": "All",
|
|
||||||
"value": "$__all"
|
|
||||||
},
|
|
||||||
"datasource": "${DS_LOKI}",
|
|
||||||
"definition": "label_values(stream)",
|
|
||||||
"hide": 0,
|
|
||||||
"includeAll": true,
|
|
||||||
"multi": true,
|
|
||||||
"name": "stream",
|
|
||||||
"options": [],
|
|
||||||
"query": "label_values(stream)",
|
|
||||||
"refresh": 1,
|
|
||||||
"regex": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"sort": 0,
|
|
||||||
"type": "query"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"current": {
|
|
||||||
"selected": false,
|
|
||||||
"text": "Loki",
|
|
||||||
"value": "Loki"
|
|
||||||
},
|
|
||||||
"hide": 0,
|
|
||||||
"includeAll": false,
|
|
||||||
"label": "Datasource",
|
|
||||||
"multi": false,
|
|
||||||
"name": "DS_LOKI",
|
|
||||||
"options": [],
|
|
||||||
"query": "loki",
|
|
||||||
"refresh": 1,
|
|
||||||
"regex": "",
|
|
||||||
"skipUrlSync": false,
|
|
||||||
"type": "datasource"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"time": {
|
|
||||||
"from": "now-6h",
|
|
||||||
"to": "now"
|
|
||||||
},
|
|
||||||
"timepicker": {},
|
|
||||||
"timezone": "",
|
|
||||||
"title": "Flux Logs",
|
|
||||||
"uid": "flux-logs",
|
|
||||||
"version": 2
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
namespace: monitoring
|
|
||||||
resources:
|
|
||||||
- podmonitor.yaml
|
|
||||||
configMapGenerator:
|
|
||||||
- name: flux-grafana-dashboards
|
|
||||||
files:
|
|
||||||
- dashboards/control-plane.json
|
|
||||||
- dashboards/cluster.json
|
|
||||||
- dashboards/logs.json
|
|
||||||
options:
|
|
||||||
labels:
|
|
||||||
grafana_dashboard: "1"
|
|
||||||
app.kubernetes.io/part-of: flux
|
|
||||||
app.kubernetes.io/component: monitoring
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
apiVersion: monitoring.coreos.com/v1
|
|
||||||
kind: PodMonitor
|
|
||||||
metadata:
|
|
||||||
name: flux-system
|
|
||||||
namespace: flux-system
|
|
||||||
labels:
|
|
||||||
app.kubernetes.io/part-of: flux
|
|
||||||
app.kubernetes.io/component: monitoring
|
|
||||||
spec:
|
|
||||||
namespaceSelector:
|
|
||||||
matchNames:
|
|
||||||
- flux-system
|
|
||||||
selector:
|
|
||||||
matchExpressions:
|
|
||||||
- key: app
|
|
||||||
operator: In
|
|
||||||
values:
|
|
||||||
- helm-controller
|
|
||||||
- source-controller
|
|
||||||
- kustomize-controller
|
|
||||||
- notification-controller
|
|
||||||
- image-automation-controller
|
|
||||||
- image-reflector-controller
|
|
||||||
podMetricsEndpoints:
|
|
||||||
- port: http-prom
|
|
||||||
relabelings:
|
|
||||||
# https://github.com/prometheus-operator/prometheus-operator/issues/4816
|
|
||||||
- sourceLabels: [__meta_kubernetes_pod_phase]
|
|
||||||
action: keep
|
|
||||||
regex: Running
|
|
||||||
Reference in New Issue
Block a user