Merge branch 'main' into develop

charts/wazuh/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.21
+version: 0.2.21-rc.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/wazuh/files/scripts/backup-indexer.sh

@@ -0,0 +1,23 @@
+## Initialize the backup folder
+bkp_folder=/tmp/wazuh_files_backup
+mkdir -p $bkp_folder
+
+## Backup the host information
+cat /etc/*release* > $bkp_folder/host-info.txt
+
+## Install rsync
+yum install -y rsync
+
+## Backup the Wazuh files
+rsync -aREz \
+  --ignore-missing-args \
+  /etc/wazuh-indexer/certs/ \
+  /etc/wazuh-indexer/jvm.options \
+  /etc/wazuh-indexer/jvm.options.d \
+  /etc/wazuh-indexer/log4j2.properties \
+  /etc/wazuh-indexer/opensearch.yml \
+  /etc/wazuh-indexer/opensearch.keystore \
+  /etc/wazuh-indexer/opensearch-observability/ \
+  /etc/wazuh-indexer/opensearch-reports-scheduler/ \
+  /etc/wazuh-indexer/opensearch-security/ \
+  /usr/lib/sysctl.d/wazuh-indexer.conf $bkp_folder

charts/wazuh/files/scripts/backup-manager.sh

@@ -0,0 +1,48 @@
+## Initialize the backup folder
+bkp_folder=/tmp/wazuh_files_backup
+mkdir -p $bkp_folder
+
+## Backup the host information
+cat /etc/*release* > $bkp_folder/host-info.txt
+
+## Install rsync
+yum install -y rsync
+
+## Backup the Wazuh files
+rsync -aREz -v --stats --progress \
+  --ignore-missing-args \
+  /etc/filebeat/ \
+  /etc/postfix/ \
+  /var/ossec/api/configuration/ \
+  /var/ossec/etc/client.keys \
+  /var/ossec/etc/sslmanager* \
+  /var/ossec/etc/ossec.conf \
+  /var/ossec/etc/internal_options.conf \
+  /var/ossec/etc/local_internal_options.conf \
+  /var/ossec/etc/rules/local_rules.xml \
+  /var/ossec/etc/decoders/local_decoder.xml \
+  /var/ossec/etc/shared/ \
+  /var/ossec/queue/agentless/ \
+  /var/ossec/queue/agents-timestamp \
+  /var/ossec/queue/fts/ \
+  /var/ossec/queue/rids/ \
+  /var/ossec/stats/ \
+  /var/ossec/var/multigroups/ \
+  $bkp_folder
+
+## Backup the Wazuh files
+rsync -aREz -v --stats --progress \
+  /var/ossec/queue/db/ \
+  $bkp_folder
+
+
+# Merge the two for loops
+for i in {1..20} ; do
+  if [ $i -lt 10 ]; then
+    echo "Copying 012.db to 0$i.db"
+    rsync -aREz -v --stats --progress --ignore-missing-args "/var/ossec/queue/db/00$i.db" $bkp_folder
+  else
+    echo "Copying 012.db to $i.db"
+    rsync -aREz -v --stats --progress --ignore-missing-args "/var/ossec/queue/db/0$i.db" $bkp_folder
+  fi
+done

charts/wazuh/files/scripts/certs.json

@@ -0,0 +1 @@
+{"root-ca.pem":"-----BEGIN CERTIFICATE-----\nMIIDbTCCAlWgAwIBAgIUexcJCKPqBeep6y/4HwVwvOQOurAwDQYJKoZIhvcNAQEL\nBQAwRjELMAkGA1UEBhMCVVMxEzARBgNVBAcMCkNhbGlmb3JuaWExEDAOBgNVBAoM\nB0NvbXBhbnkxEDAOBgNVBAMMB3Jvb3QtY2EwHhcNMjQxMDAyMDkzMzU3WhcNMzQw\nOTMwMDkzMzU3WjBGMQswCQYDVQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEQ\nMA4GA1UECgwHQ29tcGFueTEQMA4GA1UEAwwHcm9vdC1jYTCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBALbN87VhycF2/XFsQdgVtexkUOFunfQ6RXHYmcOS\nVi/JG0gvzTZQvHBoPU+PXhjEtYO7846oK6EtIyq7CAH79HFz8yQiKwZhQiPFt1YD\nsnAvzfcqqsS64gg0ckvwyuar4PR3cJEzfK0FXnEoy1YIWAC0Kngpr0HYKKmZZ3su\nHLy6CcAybr5YGpTcxpNLSAiK3e84HnElzTy2G0oGEboWSBhyvcLGPdbjim+q9cFR\nESoEC/C6qka4TE1fn4VbZQRznqhsjZgt1I5O+GTLVTgJiUE9Dcip457d+GaptEBd\nrPX3XJXMUyCujhKON4tpO9OzhhZ0EN4aDD8F14BKFRzLDgsCAwEAAaNTMFEwHQYD\nVR0OBBYEFB6eG9pOc1rLmhqEERlept1O9JdZMB8GA1UdIwQYMBaAFB6eG9pOc1rL\nmhqEERlept1O9JdZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB\nAFsJ6RmOUAtNjCEn13SIzz6EB1dgxlWohGXBqcEVwFr7IfVLcYdnD596s57Av16G\nyR+Q/TAmaOVrYGj0UMPjyC0V8r2xLYfnh2YkmUdwz814VyG8DJCUlq4MoMLC9deP\nsab52kIlSPfVhDBDWmwxS0Dfsz0KElsmn8Z0a40OGyCopQH6imIMxYRgv+IXAaVi\nnUL76FGT8ISsynTHxgqh1MJswOSnK4jkEb9+U+NCXE1I4RB/U/EGl6lQrCMHuTu7\nkqQB/PRI1K5wJvm5lWNCUjczkxUgHYl76grXRp4uPwNM6C7A50/B8cXod9Yw0ejX\nAOkg4OcPjjbhOo7MpHSfqX4=\n-----END CERTIFICATE-----","root-ca-key.pem":"-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2zfO1YcnBdv1x\nbEHYFbXsZFDhbp30OkVx2JnDklYvyRtIL802ULxwaD1Pj14YxLWDu/OOqCuhLSMq\nuwgB+/Rxc/MkIisGYUIjxbdWA7JwL833KqrEuuIINHJL8Mrmq+D0d3CRM3ytBV5x\nKMtWCFgAtCp4Ka9B2CipmWd7Lhy8ugnAMm6+WBqU3MaTS0gIit3vOB5xJc08thtK\nBhG6FkgYcr3Cxj3W44pvqvXBUREqBAvwuqpGuExNX5+FW2UEc56obI2YLdSOTvhk\ny1U4CYlBPQ3IqeOe3fhmqbRAXaz191yVzFMgro4SjjeLaTvTs4YWdBDeGgw/BdeA\nShUcyw4LAgMBAAECggEADsg1qlenfGz2Tpst8d7DkMOF5MzQmgSyQ+P7fxyQupl9\nCsfOxNMfgcl0F8BkoAUcFnR22/TOXmCrhNON8Lcii6AQK75Vk1T/B6x/yEVRQxAi\njBeXqoPgLkCrc2ebyK5iaPJVmHA85zLVcboWQzU2hIwNGR1pzh3AIALHIudWLI6N\nRUwtXs2YLL8fFvxQ894vu38NdIm/7PRJVppeOd1nC9Ry01yJt+F9TZ8y7XcgAHDi\nAAwyvjxEGAFaG97QKfjRegw+kcVBFaznSJ6yq6RdMLsKgktjts1JuVOpqAo6MYzL\nRpfEymuU4AtefRWjSHILO9Bw+qeCtp40nCX5AqRMbQKBgQD7QRbMKEAUOoBsnEhc\nKXJnRuKkG+Iu+v3mgXEoxRieofB1YE7/dFJi+Gru7lDIqlVcr0hLGfsNJ4s9uF8Z\nBWSibUgDNYFwPFJgK8fRQCn5fh8w3ejyFtHQku9KPxlVDKrDwvE4Njirnvgq3MRD\nFdEsXbRSZovPF7X7fTxHdzyB/QKBgQC6QeHN3q0NH6FEuqIFiZYgvFfY43fpYzW3\nYqUmMsTC4pIYeUwT+dQfRcKSiuzjxtG1qNx8q0cMjs1ZEhd3syuDQQaDL+NANu+H\nmqqFYHqugTD7EXO5p+Ge2T2XTn2NFVTE6KPS9EwJc+/G9D92SUGy4Mld8jTIH/9Y\ngTPDttXqpwKBgGenYZ1WGaF+xQ6JpvyGiND8mHG1oylYmLiovCNitJZ1Hnt+APk4\nZui3rX3myWMPimnTUlLRZBX4M2SCFJGA/RRZWzUftMe1yxIr3aKBAxAPrRR+6CQ/\nr82JYLjTsUK6GBTs7pEPJXAABEfCjiFS9dmEyuiXr6P/Fy+qadzd3xONAoGBAJea\nDlACAjrfVuVZP41gSqkEhEBODYkSrmNA0ImB4zN5NU7kU+8iduypXFDo8R4I8yJ4\nelajFqZ7CVuJZT6RwEYKRGG9NaxLyrVGR6teNx0YnKSOtPIVWohv7Djes0SFa0UG\n0mlfXRCIpE78+TavM+GEI4LrJNkLakxAhcC0bfObAoGAeXMvxDXyHUgElzM4aK+M\n91UaDBXcPcRg06ljJdOhh1kgJTd1O4EFSKWBF6uTluCIBeJF+azYZpMVXwdeA0hq\nRMO1Oq57Io9W3qKJ6M9dgHr+chGwKlYLucAK1yizmWXeFeN4yTQw2Akf+0ZDlO0+\nGHpWew24KuI8AWzcVF0UJwI=\n-----END PRIVATE KEY-----"}

charts/wazuh/files/scripts/restor.sh

@@ -0,0 +1,34 @@
+cp etc/filebeat/filebeat.reference.yml /etc/filebeat/
+cp etc/filebeat/fields.yml /etc/filebeat/
+cp -r etc/filebeat/modules.d/* /etc/filebeat/modules.d/
+cp -r etc/postfix/* /etc/postfix/
+cp var/ossec/etc/client.keys /var/ossec/etc/
+chown root:wazuh /var/ossec/etc/client.keys
+cp -r var/ossec/etc/sslmanager* /var/ossec/etc/
+cp var/ossec/etc/ossec.conf /var/ossec/etc/
+chown root:wazuh /var/ossec/etc/ossec.conf
+cp var/ossec/etc/internal_options.conf /var/ossec/etc/
+chown root:wazuh /var/ossec/etc/internal_options.conf
+cp var/ossec/etc/local_internal_options.conf /var/ossec/etc/
+chown root:wazuh /var/ossec/etc/local_internal_options.conf
+cp -r var/ossec/etc/rules/* /var/ossec/etc/rules/
+chown -R wazuh:wazuh /var/ossec/etc/rules/
+cp -r var/ossec/etc/decoders/* /var/ossec/etc/decoders
+chown -R wazuh:wazuh /var/ossec/etc/decoders/
+cp -r var/ossec/etc/shared/* /var/ossec/etc/shared/
+chown -R wazuh:wazuh /var/ossec/etc/shared/
+chown root:wazuh /var/ossec/etc/shared/ar.conf
+cp -r var/ossec/logs/* /var/ossec/logs/
+chown -R wazuh:wazuh /var/ossec/logs/
+cp -r var/ossec/queue/agentless/*  /var/ossec/queue/agentless/
+chown -R wazuh:wazuh /var/ossec/queue/agentless/
+cp var/ossec/queue/agents-timestamp /var/ossec/queue/
+chown root:wazuh /var/ossec/queue/agents-timestamp
+cp -r var/ossec/queue/fts/* /var/ossec/queue/fts/
+chown -R wazuh:wazuh /var/ossec/queue/fts/
+cp -r var/ossec/queue/rids/* /var/ossec/queue/rids/
+chown -R wazuh:wazuh /var/ossec/queue/rids/
+cp -r var/ossec/stats/* /var/ossec/stats/
+chown -R wazuh:wazuh /var/ossec/stats/
+cp -r var/ossec/var/multigroups/* /var/ossec/var/multigroups/
+chown -R wazuh:wazuh /var/ossec/var/multigroups/

charts/wazuh/templates/common/svc.yaml

@@ -0,0 +1,56 @@
+{{ range $name, $val := .Values.svcs -}}
+{{- if $val.enabled -}}
+{{- with $val }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.tplvalues.render" (dict "value" $name "context" $) }}
+  namespace: {{ include "common.names.namespace" $ }}
+  labels:
+    {{- include "common.labels.standard" ( dict "customLabels" .additionalLabels "context" $ ) | nindent 4 }}
+  annotations:
+    {{- include "common.annotations.standard" ( dict "customAnnotations" .annotations "context" $ ) | nindent 4 }}
+spec:
+  {{ with .type }}
+  type: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ if eq .type "LoadBalancer" }}
+  {{ with .loadBalancerClass }}
+  loadBalancerClass: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ end }}
+  selector:
+    {{- include "common.labels.matchLabels" $ | nindent 4 }}
+    {{- include "common.tplvalues.render" (dict "value" .selector "context" $) | nindent 4 -}}
+  {{ with .ports }}
+  ports:
+  {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 4 -}}
+  {{ end }}
+  {{ with .loadBalancerIP }}
+  loadBalancerIP: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{- end }}
+  {{ with .allocateLoadBalancerNodePorts }}
+  allocateLoadBalancerNodePorts: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{- end }}
+  {{ with .clusterIP }}
+  clusterIP: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ with .externalTrafficPolicy }}
+  externalTrafficPolicy: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ with .sessionAffinity }}
+  sessionAffinity: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ with .externalName }}
+  externalName: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ with .healthCheckNodePort }}
+  healthCheckNodePort: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+  {{ with .publishNotReadyAddresses }}
+  publishNotReadyAddresses: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+  {{ end }}
+---
+{{- end -}}
+{{- end -}}
+{{- end }}

charts/wazuh/templates/dashboard/deploy.dashboard.yaml

@@ -78,7 +78,7 @@ spec:
             - name: INDEXER_URL
               value: 'https://{{ include "common.names.fullname" $ }}-indexer-api:9200'
             - name: WAZUH_API_URL
-              value: 'https://{{ include "common.names.fullname" $ }}-manager'
+              value: 'https://{{ include "common.names.fullname" $ }}'
             - name: SERVER_SSL_ENABLED
               value: "true"
             - name: SERVER_SSL_CERTIFICATE

charts/wazuh/templates/dashboard/ing.dashboard.yaml

@@ -1,4 +1,4 @@
-{{- if and (.Values.dashboard.ingress.enabled) (eq .Values.dashboard.service.type "ClusterIP") }}
+{{- if .Values.dashboard.ingress.enabled }}
 {{ with .Values.dashboard.ingress -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -11,7 +11,7 @@ metadata:
     {{- include "common.labels.standard" ( dict "customLabels" .additionalLabels "context" $ ) | nindent 4 }}
 spec:
   {{ with .className -}}
-  ingressClassName: {{ . }}
+  ingressClassName: {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
   {{- end }}
   rules:
     - host: {{ include "common.tplvalues.render" (dict "value" .host "context" $) }}
@@ -23,7 +23,7 @@ spec:
               service:
                 name: {{ include "common.names.fullname" $ }}-dashboard
                 port:
-                  number: {{ include "common.tplvalues.render" (dict "value" $.Values.dashboard.service.port "context" $) }}
+                  number: {{ include "common.tplvalues.render" (dict "value" .port "context" $) }}
   tls:
     - hosts:
         - {{ include "common.tplvalues.render" (dict "value" .host "context" $) }}

charts/wazuh/templates/helpers/_cert_config.tpl

@@ -9,7 +9,7 @@ generate_cert "indexer" \
     "{{ include "common.names.fullname" $ }}-indexer-api,*.{{ include "common.names.fullname" $ }}-indexer"
 
 generate_cert "server" \
-    "{{ include "common.names.fullname" $ }}-manager,*.{{ include "common.names.fullname" $ }}-cluster,{{ include "common.names.fullname" $ }}-master,{{ include "common.names.fullname" $ }},*.{{ include "common.names.fullname" $ }}"
+    "{{ include "common.names.fullname" $ }}-manager,*.{{ include "common.names.fullname" $ }}-cluster,{{ include "common.names.fullname" $ }}-cluster,{{ include "common.names.fullname" $ }},*.{{ include "common.names.fullname" $ }}"
 
 generate_cert "dashboard" \
     "{{ include "common.names.fullname" $ }}-dashboard,*.{{ include "common.names.fullname" $ }}-dashboard"

charts/wazuh/templates/indexer/svc.indexer-api.yaml

@@ -6,7 +6,6 @@ metadata:
   namespace: {{ include "common.names.namespace" $ }}
   labels:
     {{- include "common.labels.standard" ( dict "customLabels" .additionalLabels "context" $ ) | nindent 4 }}
-    app: {{ include "common.names.fullname" $ }}-indexer
   annotations:
     {{- include "common.annotations.standard" ( dict "customAnnotations" .annotations "context" $ ) | nindent 4 }}
 spec:

charts/wazuh/templates/indexer/svc.indexer.yaml

@@ -9,7 +9,6 @@ metadata:
     {{- include "common.annotations.standard" ( dict "customAnnotations" .annotations "context" $ ) | nindent 4 }}
   labels:
     {{- include "common.labels.standard" ( dict "customLabels" .additionalLabels "context" $ ) | nindent 4 }}
-    app: {{ include "common.names.fullname" $ }}-indexer
 spec:
   selector:
     {{- include "common.labels.matchLabels" ( dict "customLabels" .additionalLabels "context" $ ) | nindent 4 }}