From 0f263527476189f55659d7af1a2530defeb9a13b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 3 Mar 2022 16:32:42 -0300 Subject: [PATCH] Update dashboard.yml name and indexer ports --- README.md | 116 +++++++++--------- instructions.md | 4 +- .../wazuh-dashboard/dashboard-deploy.yaml | 6 +- ...ashboard.yml => opensearch_dashboards.yml} | 2 +- .../cluster/indexer-api-svc.yaml | 4 +- .../wazuh-indexer/cluster/indexer-sts.yaml | 4 +- .../wazuh-indexer/indexer_conf/opensearch.yml | 2 - wazuh/kustomization.yml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 10 files changed, 72 insertions(+), 72 deletions(-) rename wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/{dashboard.yml => opensearch_dashboards.yml} (94%) diff --git a/README.md b/README.md index 823ef48..f703bcf 100644 --- a/README.md +++ b/README.md @@ -19,63 +19,65 @@ The [instructions.md](instructions.md) file describes how to deploy Wazuh on Kub ## Directory structure - ├── CHANGELOG.md - ├── cleanup.md - ├── instructions.md - ├── LICENSE - ├── README.md - ├── upgrade.md - ├── VERSION - ├── envs - │   ├── eks - │   │   ├── elastic-resources.yaml - │   │   ├── kibana-resources.yaml - │   │   ├── kustomization.yml - │   │   ├── storage-class.yaml - │   │   ├── wazuh-master-resources.yaml - │   │   └── wazuh-worker-resources.yaml - │   └── local-env - │   ├── elastic-resources.yaml - │   ├── kustomization.yml - │   ├── storage-class.yaml - │   └── wazuh-resources.yaml - └── wazuh - ├── base - │   ├── storage-class.yaml - │   └── wazuh-ns.yaml - ├── certs - │   ├── kibana_http - │   │   ├── generate_certs.sh - │   └── odfe_cluster - │   ├── generate_certs.sh - ├── elastic_stack - │   ├── elasticsearch - │   │   ├── cluster - │   │   │   ├── elasticsearch-api-svc.yaml - │   │   │   └── elasticsearch-sts.yaml - │   │   ├── elastic_conf - │   │   │   ├── elasticsearch.yml - │   │   │   └── internal_users.yml - │   │   └── elasticsearch-svc.yaml - │   └── kibana - │   ├── kibana-deploy.yaml - │   └── kibana-svc.yaml - ├── kustomization.yml - ├── secrets - │   ├── elastic-cred-secret.yaml - │   ├── wazuh-api-cred-secret.yaml - │   ├── wazuh-authd-pass-secret.yaml - │   └── wazuh-cluster-key-secret.yaml - └── wazuh_managers - ├── wazuh-cluster-svc.yaml - ├── wazuh_conf - │   ├── master.conf - │   └── worker.conf - ├── wazuh-master-sts.yaml - ├── wazuh-master-svc.yaml - ├── wazuh-workers-svc.yaml - └── wazuh-worker-sts.yaml - +├── CHANGELOG.md +├── cleanup.md +├── envs +│   ├── eks +│   │   ├── dashboard-resources.yaml +│   │   ├── indexer-resources.yaml +│   │   ├── kustomization.yml +│   │   ├── storage-class.yaml +│   │   ├── wazuh-master-resources.yaml +│   │   └── wazuh-worker-resources.yaml +│   └── local-env +│   ├── indexer-resources.yaml +│   ├── kustomization.yml +│   ├── storage-class.yaml +│   └── wazuh-resources.yaml +├── instructions.md +├── LICENSE +├── local-environment.md +├── README.md +├── upgrade.md +├── VERSION +└── wazuh + ├── base + │   ├── storage-class.yaml + │   └── wazuh-ns.yaml + ├── certs + │   ├── dashboard_http + │   │   └── generate_certs.sh + │   └── indexer_cluster + │   └── generate_certs.sh + ├── indexer_stack + │   ├── wazuh-dashboard + │   │   ├── dashboard_conf + │   │   │   └── dashboard.yml + │   │   ├── dashboard-deploy.yaml + │   │   └── dashboard-svc.yaml + │   └── wazuh-indexer + │   ├── cluster + │   │   ├── indexer-api-svc.yaml + │   │   └── indexer-sts.yaml + │   ├── indexer_conf + │   │   ├── internal_users.yml + │   │   └── opensearch.yml + │   └── indexer-svc.yaml + ├── kustomization.yml + ├── secrets + │   ├── indexer-cred-secret.yaml + │   ├── wazuh-api-cred-secret.yaml + │   ├── wazuh-authd-pass-secret.yaml + │   └── wazuh-cluster-key-secret.yaml + └── wazuh_managers + ├── wazuh-cluster-svc.yaml + ├── wazuh_conf + │   ├── master.conf + │   └── worker.conf + ├── wazuh-master-sts.yaml + ├── wazuh-master-svc.yaml + ├── wazuh-workers-svc.yaml + └── wazuh-worker-sts.yaml ## Branches diff --git a/instructions.md b/instructions.md index 98d7282..b3ad0b5 100644 --- a/instructions.md +++ b/instructions.md @@ -161,10 +161,10 @@ wazuh Active 12m $ kubectl get services -n wazuh NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE dashboard LoadBalancer 10.100.55.244 443:31670/TCP 4h13m -indexer LoadBalancer 10.100.199.148 9700:32270/TCP 4h13m +indexer LoadBalancer 10.100.199.148 9200:32270/TCP 4h13m wazuh LoadBalancer 10.100.176.82 1515:32602/TCP,55000:32116/TCP 4h13m wazuh-cluster ClusterIP None 1516/TCP 4h13m -wazuh-indexer ClusterIP None 9800/TCP 4h13m +wazuh-indexer ClusterIP None 9300/TCP 4h13m wazuh-workers LoadBalancer 10.100.165.20 1514:30128/TCP 4h13m ``` diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index a06c1d5..eb537a1 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -39,8 +39,8 @@ spec: memory: 1Gi volumeMounts: - name: config - mountPath: /etc/wazuh-dashboard/dashboard.yml - subPath: dashboard.yml + mountPath: /etc/wazuh-dashboard/opensearch_dashboards.yml + subPath: opensearch_dashboards.yml readOnly: false - name: dashboard-certs mountPath: /etc/wazuh-dashboard/certs/cert.pem @@ -55,7 +55,7 @@ spec: name: dashboard env: - name: ELASTICSEARCH_URL - value: 'https://wazuh-indexer-0.wazuh-indexer:9700' + value: 'https://wazuh-indexer-0.wazuh-indexer:9200' - name: ELASTICSEARCH_USERNAME valueFrom: secretKeyRef: diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/dashboard.yml b/wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/opensearch_dashboards.yml similarity index 94% rename from wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/dashboard.yml rename to wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/opensearch_dashboards.yml index cf3c311..f979b19 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/dashboard.yml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard_conf/opensearch_dashboards.yml @@ -1,7 +1,7 @@ server.host: 0.0.0.0 server.port: 443 -opensearch.hosts: https://indexer:9700 +opensearch.hosts: https://indexer:9200 opensearch.ssl.verificationMode: none opensearch.username: kibanaserver22 opensearch.password: holamundo1 diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-api-svc.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-api-svc.yaml index d886494..205241c 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-api-svc.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-api-svc.yaml @@ -20,5 +20,5 @@ spec: app: wazuh-indexer ports: - name: indexer-rest - port: 9700 - targetPort: 9700 + port: 9200 + targetPort: 9200 diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 0879605..d47f49f 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -118,9 +118,9 @@ spec: subPath: internal_users.yml readOnly: true ports: - - containerPort: 9700 + - containerPort: 9200 name: indexer-rest - - containerPort: 9800 + - containerPort: 9300 name: indexer-nodes volumeClaimTemplates: - metadata: diff --git a/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml b/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml index 47c1175..04cee52 100644 --- a/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml +++ b/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml @@ -5,8 +5,6 @@ discovery.seed_hosts: wazuh-indexer-0.wazuh-indexer cluster.initial_master_nodes: - wazuh-indexer-0 -http.port: 9700-9799 -transport.tcp.port: 9800-9899 node.max_local_storage_nodes: "3" path.data: /var/lib/wazuh-indexer path.logs: /var/log/wazuh-indexer diff --git a/wazuh/kustomization.yml b/wazuh/kustomization.yml index 94d6696..efecc69 100644 --- a/wazuh/kustomization.yml +++ b/wazuh/kustomization.yml @@ -39,7 +39,7 @@ configMapGenerator: - wazuh_managers/wazuh_conf/worker.conf - name: dashboard-conf files: - - indexer_stack/wazuh-dashboard/dashboard_conf/dashboard.yml + - indexer_stack/wazuh-dashboard/dashboard_conf/opensearch_dashboards.yml resources: - base/wazuh-ns.yaml diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index d76af71..fcc44fa 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -110,7 +110,7 @@ spec: name: api env: - name: ELASTICSEARCH_URL - value: 'https://wazuh-indexer-0.wazuh-indexer:9700' + value: 'https://wazuh-indexer-0.wazuh-indexer:9200' - name: ELASTIC_USERNAME valueFrom: secretKeyRef: diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index f9fd88f..c1e1502 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -107,7 +107,7 @@ spec: name: cluster env: - name: ELASTICSEARCH_URL - value: 'https://wazuh-indexer-0.wazuh-indexer:9700' + value: 'https://wazuh-indexer-0.wazuh-indexer:9200' - name: ELASTIC_USERNAME valueFrom: secretKeyRef: