Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions contexts/_template/blueprint.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ local kustomizeConfigs = {
path: "telemetry/base",
components: [
"prometheus",
"prometheus/flux"
"prometheus/flux",
"fluentbit",
"fluentbit/prometheus"
],
},
{
Expand All @@ -90,7 +92,12 @@ local kustomizeConfigs = {
components: [
"metrics-server",
"prometheus",
"prometheus/flux"
"prometheus/flux",
"fluentbit",
"fluentbit/containerd",
"fluentbit/fluentd",
"fluentbit/kubernetes",
"fluentbit/systemd"
],
},
{
Expand Down Expand Up @@ -167,6 +174,7 @@ local kustomizeConfigs = {
"ingress"
],
components: [
"fluentd",
"grafana",
"grafana/ingress",
"grafana/prometheus",
Expand All @@ -182,7 +190,9 @@ local kustomizeConfigs = {
path: "telemetry/base",
components: [
"prometheus",
"prometheus/flux"
"prometheus/flux",
"fluentbit",
"fluentbit/prometheus"
],
},
{
Expand All @@ -193,7 +203,12 @@ local kustomizeConfigs = {
],
components: [
"prometheus",
"prometheus/flux"
"prometheus/flux",
"fluentbit",
"fluentbit/containerd",
"fluentbit/fluentd",
"fluentbit/kubernetes",
"fluentbit/systemd"
],
},
{
Expand Down Expand Up @@ -261,6 +276,7 @@ local kustomizeConfigs = {
"ingress"
],
components: [
"fluentd",
"grafana",
"grafana/ingress",
"grafana/prometheus",
Expand Down Expand Up @@ -417,6 +433,22 @@ local kustomizeConfigs = {
components: [
"webhook"
],
},
{
name: "observability",
path: "observability",
dependsOn: [
"ingress"
],
components: [
"fluentd",
"grafana",
"grafana/ingress",
"grafana/prometheus",
"grafana/node",
"grafana/kubernetes",
"grafana/flux"
],
}
]
};
Expand Down
2 changes: 2 additions & 0 deletions kustomize/observability/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources:
- namespace.yaml
9 changes: 9 additions & 0 deletions kustomize/observability/base/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: v1
kind: Namespace
metadata:
name: system-observability
labels:
pod-security.kubernetes.io/enforce: baseline
pod-security.kubernetes.io/audit: baseline
pod-security.kubernetes.io/warn: baseline
use-custom-ca: "true"
51 changes: 51 additions & 0 deletions kustomize/observability/fluentd/fluentd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
apiVersion: fluentd.fluent.io/v1alpha1
kind: Fluentd
metadata:
labels:
app.kubernetes.io/name: fluentd
name: fluentd
namespace: system-observability
spec:
fluentdCfgSelector:
matchLabels:
config.fluentd.fluent.io/enabled: "true"
globalInputs:
- forward:
bind: 0.0.0.0
port: 24224
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
logLevel: info
mode: collector
positionDB: {}
replicas: 1
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 100m
memory: 128Mi
service: {}
status:
messages: all matched cfgs is valid
state: active
---
apiVersion: fluentd.fluent.io/v1alpha1
kind: ClusterFluentdConfig
metadata:
labels:
config.fluentd.fluent.io/enabled: "true"
name: fluentd-config
spec:
clusterFilterSelector:
matchLabels:
filter.fluentd.fluent.io/enabled: "true"
clusterOutputSelector:
matchLabels:
output.fluentd.fluent.io/enabled: "true"
watchedNamespaces:
- kube-system
- default
status:
messages: Generate fluentd configs successfully
state: valid
27 changes: 27 additions & 0 deletions kustomize/observability/fluentd/helm-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: fluent-operator-config
namespace: system-observability
spec:
interval: 5m
timeout: 5m
chart:
spec:
chart: charts/fluent-operator
# chart: fluent-operator
# renovate: datasource=helm depName=fluent-operator package=fluent-operator helmRepo=https://fluent.github.io/helm-charts
# version: 3.2.0
sourceRef:
kind: GitRepository
name: fluent-operator
namespace: system-gitops
values:
containerRuntime: containerd
fluentd:
enable: true
crdsEnable: false
fluentbit:
enable: true
crdsEnable: false
4 changes: 4 additions & 0 deletions kustomize/observability/fluentd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- fluentd.yaml
9 changes: 9 additions & 0 deletions kustomize/observability/fluentd/stdout/clusteroutput.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: fluentd.fluent.io/v1alpha1
kind: ClusterOutput
metadata:
name: stdout
labels:
output.fluentd.fluent.io/enabled: "true"
spec:
outputs:
- stdout: {}
4 changes: 4 additions & 0 deletions kustomize/observability/fluentd/stdout/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- clusteroutput.yaml
Loading