diff --git a/.yamllint b/.yamllint index 4e0fa48..67b7637 100644 --- a/.yamllint +++ b/.yamllint @@ -6,6 +6,7 @@ ignore: - '.github/' - '**/crd/**' + - mkdocs.yml - '*PrometheusRule*' - '**/source/**' diff --git a/manifests/alert-manager/base/AlertManager-cluster.yaml b/manifests/alert-manager/base/AlertManager-cluster.yaml index d4c6f63..47dd5fb 100644 --- a/manifests/alert-manager/base/AlertManager-cluster.yaml +++ b/manifests/alert-manager/base/AlertManager-cluster.yaml @@ -7,7 +7,6 @@ metadata: name: cluster spec: externalUrl: alert-manager.local - # image: "{{ .Values.nfc_monitoring.alert_manager.image.name }}:{{ .Values.nfc_monitoring.alert_manager.image.tag }}" nodeSelector: kubernetes.io/os: linux podMetadata: diff --git a/manifests/gitlab-operator/base/kustomization.yaml b/manifests/gitlab-operator/base/kustomization.yaml index fbb55f1..91f4ea5 100644 --- a/manifests/gitlab-operator/base/kustomization.yaml +++ b/manifests/gitlab-operator/base/kustomization.yaml @@ -32,7 +32,7 @@ images: newName: |- registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/gitlab-runner-operator newTag: "v1.37.0" - # config/manager/kustomization.tpl.yaml + # config/manager/kustomization.tpl.yaml - name: kube-rbac-proxy newName: |- registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/openshift4/ose-kube-rbac-proxy @@ -40,17 +40,16 @@ images: # v1.37.0 160ee6bf2ad4e05d0e673d0652cc47bd6100ddec resources: - # Dont use default as it points to invalid kustomize dirs - # - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/default?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96 + # Dont use default as it points to invalid kustomize dirs + # - /config/default?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96 - # config/default/kustomization.yaml + # config/default/kustomization.yaml - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/crd?ref=160ee6bf2ad4e05d0e673d0652cc47bd6100ddec - # config/default/kustomization.yaml + # config/default/kustomization.yaml - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/rbac?ref=160ee6bf2ad4e05d0e673d0652cc47bd6100ddec - # config/manager/kustomization.tpl.yaml - # - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/manager/manager.yaml?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96 + # config/manager/kustomization.tpl.yaml - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/-/raw/160ee6bf2ad4e05d0e673d0652cc47bd6100ddec/config/manager/manager.yaml diff --git a/manifests/gitlab-operator/components/runner/ConfigMap.yaml b/manifests/gitlab-operator/components/runner/ConfigMap.yaml index 566fa2b..bd8bdf1 100644 --- a/manifests/gitlab-operator/components/runner/ConfigMap.yaml +++ b/manifests/gitlab-operator/components/runner/ConfigMap.yaml @@ -36,4 +36,4 @@ data: host_path = "/opt/webserver/nofusscomputing.com" [runners.kubernetes.node_tolerations] - "CriticalAddonsOnly=true" = "NoExecute" \ No newline at end of file + "CriticalAddonsOnly=true" = "NoExecute" diff --git a/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml b/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml index 0a8d0dd..6a20d8c 100644 --- a/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml +++ b/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml @@ -20,9 +20,7 @@ data: procfs_path: /host/proc udev_data_path: /host/root/run/udev/data - # collector.filesystem.ignored-mount-points: ^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+|/run/containerd/io.containerd.+)($|/) filesystem_mount_points_exclude: "^/(dev|proc|sys|var/lib/docker/.+|/run/containerd/io.containerd.+)($|/)" - #filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|shm|squashfs|sysfs|tracefs)$" filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|ugfs|devpts|devtmpfs|tmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|ocfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$" diff --git a/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml b/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml index 2fbaec8..3ff8b3c 100644 --- a/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml +++ b/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml @@ -10,68 +10,66 @@ metadata: name: node spec: endpoints: + - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + interval: 5s + honorLabels: true + path: /metrics + port: grafana-metrics + scheme: http + relabelings: + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: instance + - targetLabel: "job" + replacement: "node-exporter" + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: node + metricRelabelings: + - action: drop + sourceLabels: [ __name__ ] + regex: "(promtail_).*" - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - interval: 5s - honorLabels: true - path: /metrics - port: grafana-metrics - scheme: http - relabelings: - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: instance - - targetLabel: "job" - replacement: "node-exporter" - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: node - metricRelabelings: - - action: drop - sourceLabels: [__name__] - regex: '(promtail_).*' - - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - interval: 5s - honorLabels: true - path: /metrics - port: grafana-metrics - scheme: http - relabelings: - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: instance - - targetLabel: "job" - replacement: "promtail" - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: node - - action: replace - separator: / - sourceLabels: - - namespace - - job - targetLabel: job - metricRelabelings: - - action: keep - sourceLabels: [__name__] - regex: '(promtail_).*' + - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + interval: 5s + honorLabels: true + path: /metrics + port: grafana-metrics + scheme: http + relabelings: + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: instance + - targetLabel: "job" + replacement: "promtail" + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: node + - action: replace + separator: / + sourceLabels: + - namespace + - job + targetLabel: job + metricRelabelings: + - action: keep + sourceLabels: [ __name__ ] + regex: "(promtail_).*" selector: matchLabels: app.kubernetes.io/component: exporter app.kubernetes.io/instance: cluster app.kubernetes.io/name: grafana-agent app.kubernetes.io/part-of: monitoring - diff --git a/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml b/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml index 545a642..3782f17 100644 --- a/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml +++ b/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml @@ -11,34 +11,32 @@ metadata: namespace: monitoring spec: endpoints: - - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - interval: 5s - honorLabels: true - path: /integrations/node_exporter/metrics - port: grafana-metrics - scheme: http - relabelings: - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: instance - - targetLabel: "job" - replacement: "node-exporter" - - action: replace - regex: (.*) - replacement: $1 - sourceLabels: - - __meta_kubernetes_pod_node_name - targetLabel: node - tlsConfig: - insecureSkipVerify: true + - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + interval: 5s + honorLabels: true + path: /integrations/node_exporter/metrics + port: grafana-metrics + scheme: http + relabelings: + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: instance + - targetLabel: "job" + replacement: "node-exporter" + - action: replace + regex: (.*) + replacement: $1 + sourceLabels: + - __meta_kubernetes_pod_node_name + targetLabel: node + tlsConfig: + insecureSkipVerify: true selector: matchLabels: app.kubernetes.io/component: exporter app.kubernetes.io/instance: cluster app.kubernetes.io/name: grafana-agent app.kubernetes.io/part-of: monitoring - diff --git a/manifests/prometheus/base/Prometheus.yaml b/manifests/prometheus/base/Prometheus.yaml index 07bb596..dc5857f 100644 --- a/manifests/prometheus/base/Prometheus.yaml +++ b/manifests/prometheus/base/Prometheus.yaml @@ -15,7 +15,6 @@ spec: enableFeatures: [] enableRemoteWriteReceiver: false externalLabels: {} - # image: {{ .Values.nfc_monitoring.prometheus.image.name }}:{{ .Values.nfc_monitoring.prometheus.image.tag}} nodeSelector: kubernetes.io/os: linux podMetadata: diff --git a/mkdocs.yml b/mkdocs.yml index 6c2cebf..9fad576 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,3 +1,5 @@ +--- + INHERIT: website-template/mkdocs.yml docs_dir: "docs"