diff --git a/on-premise/prometheusAlertManager/1_configuration/init.yaml b/on-premise/alertmanager_v0.27.0/1_configuration/init.yaml similarity index 100% rename from on-premise/prometheusAlertManager/1_configuration/init.yaml rename to on-premise/alertmanager_v0.27.0/1_configuration/init.yaml diff --git a/on-premise/prometheusAlertManager/1_configuration/pvc.yaml b/on-premise/alertmanager_v0.27.0/1_configuration/pvc.yaml similarity index 100% rename from on-premise/prometheusAlertManager/1_configuration/pvc.yaml rename to on-premise/alertmanager_v0.27.0/1_configuration/pvc.yaml diff --git a/on-premise/prometheusAlertManager/2_config/default.yaml b/on-premise/alertmanager_v0.27.0/2_config/default.yaml similarity index 100% rename from on-premise/prometheusAlertManager/2_config/default.yaml rename to on-premise/alertmanager_v0.27.0/2_config/default.yaml diff --git a/on-premise/prometheusAlertManager/3_deploy/deploy.yaml b/on-premise/alertmanager_v0.27.0/3_deploy/deploy.yaml similarity index 100% rename from on-premise/prometheusAlertManager/3_deploy/deploy.yaml rename to on-premise/alertmanager_v0.27.0/3_deploy/deploy.yaml diff --git a/on-premise/prometheusAlertManager/3_deploy/ing.yaml b/on-premise/alertmanager_v0.27.0/3_deploy/ing.yaml similarity index 100% rename from on-premise/prometheusAlertManager/3_deploy/ing.yaml rename to on-premise/alertmanager_v0.27.0/3_deploy/ing.yaml diff --git a/on-premise/nfs-provisioner/4.postSettings/sc-hm.yaml b/on-premise/nfs-provisioner/4.postSettings/sc-hm.yaml new file mode 100644 index 0000000..c8b5eb8 --- /dev/null +++ b/on-premise/nfs-provisioner/4.postSettings/sc-hm.yaml @@ -0,0 +1,13 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: hm-nas + annotations: + storageclass.kubernetes.io/is-default-class: "true" + labels: + name: provision +provisioner: k8s-sigs.io/nfs-subdir-external-provisioner +parameters: + pathPattern: "${.PVC.namespace}/${.PVC.annotations.nfs.io/storage-path}" # waits for nfs.io/storage-path annotation, if not specified will accept as empty string. + onDelete: delete + archiveOnDelete: "false" \ No newline at end of file diff --git a/on-premise/prometheus_2.54.1/2_config/default.yaml b/on-premise/prometheus_2.54.1/2_config/default.yaml index fd9debb..e46edd0 100644 --- a/on-premise/prometheus_2.54.1/2_config/default.yaml +++ b/on-premise/prometheus_2.54.1/2_config/default.yaml @@ -26,8 +26,8 @@ data: rule_files: - /etc/config/recording_rules.yml - /etc/config/alerting_rules.yml - - /etc/config/rules - - /etc/config/alerts + - /etc/config/rules/*.yaml + - /etc/config/alerts/*.yaml scrape_configs: - job_name: prometheus static_configs: diff --git a/on-premise/prometheus_2.54.1/3_deploy/deploy.yaml b/on-premise/prometheus_2.54.1/3_deploy/deploy.yaml index 1f949ea..4db108c 100644 --- a/on-premise/prometheus_2.54.1/3_deploy/deploy.yaml +++ b/on-premise/prometheus_2.54.1/3_deploy/deploy.yaml @@ -212,7 +212,9 @@ spec: - name: config-volume mountPath: /etc/config readOnly: true - + - name: config-volume2 + mountPath: /etc/config/alerts + readOnly: true - name: prometheus-server image: "quay.io/prometheus/prometheus:v2.54.1" imagePullPolicy: "IfNotPresent" @@ -248,6 +250,8 @@ spec: volumeMounts: - name: config-volume mountPath: /etc/config + - name: config-volume2 + mountPath: /etc/config/alerts - name: storage-volume mountPath: /data subPath: "" @@ -262,6 +266,10 @@ spec: - name: config-volume configMap: name: prometheus-server + - configMap: + defaultMode: 420 + name: prometheus-rulefiles + name: config-volume2 - name: storage-volume persistentVolumeClaim: claimName: prometheus-server \ No newline at end of file diff --git a/on-premise/prometheus_2.54.1/3_deploy/ing.yaml b/on-premise/prometheus_2.54.1/3_deploy/ing.yaml index 710b20a..f73b96a 100644 --- a/on-premise/prometheus_2.54.1/3_deploy/ing.yaml +++ b/on-premise/prometheus_2.54.1/3_deploy/ing.yaml @@ -18,8 +18,8 @@ spec: paths: - backend: service: - name: prometheus-prometheus-server + name: prometheus-server port: number: 80 path: / - pathType: Prefix \ No newline at end of file + pathType: Prefix