address PR nits

Author: sjpb

ansible/monitoring.yml

@@ -1,7 +1,7 @@
 # ---
 # # NOTE: Requires slurmdbd
 
-- name: Setup elasticsearch
+- name: Setup OpenSearch
   hosts: opensearch
   tags: opensearch
   tasks:

ansible/roles/filebeat/templates/filebeat.service.j2

@@ -14,10 +14,17 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=always
 ExecStart=/usr/bin/podman run \
     --network=host \
-    --sdnotify=conmon --cgroups=no-conmon --replace --name filebeat --user root --restart=always --security-opt label=disable \
+    --sdnotify=conmon \
+    --cgroups=no-conmon \
+    --replace \
+    --name filebeat \
+    --user root \
+    --restart=always \
+    --security-opt label=disable \
     --volume /var/log/:/logs:ro \
     --volume /etc/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro \
-    --detach=True docker.elastic.co/beats/filebeat-oss:{{ filebeat_version }} -e -strict.perms=false -d "*"
+    --detach=True docker.elastic.co/beats/filebeat-oss:{{ filebeat_version }} \
+    --env -strict.perms=false -d "*"
 ExecStop=/usr/bin/podman stop --ignore filebeat -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f filebeat
 KillMode=none

ansible/roles/mysql/templates/mysql.service.j2

@@ -16,12 +16,16 @@ ExecStartPre=+install -d -o {{ mysql_podman_user }} -g {{ mysql_podman_user }} -
 ExecStartPre=+chown -R {{ mysql_podman_user }}:{{ mysql_podman_user }} {{ mysql_datadir }}
 ExecStart=/usr/bin/podman run \
     --network=host \
-    --sdnotify=conmon --cgroups=no-conmon \
-    --detach --replace --name mysql --restart=no \
+    --sdnotify=conmon \
+    --cgroups=no-conmon \
+    --detach \
+    --replace \
+    --name mysql \
+    --restart=no \
     --user mysql \
     --volume {{ mysql_datadir }}:/var/lib/mysql:U \
     --publish 3306:3306 \
-    -e MYSQL_ROOT_PASSWORD=${MYSQL_INITIAL_ROOT_PASSWORD} \
+    --env MYSQL_ROOT_PASSWORD=${MYSQL_INITIAL_ROOT_PASSWORD} \
     mysql:{{ mysql_tag }}{%- for opt in mysql_mysqld_options %} \
     --{{ opt }}{% endfor %}
 

ansible/roles/opensearch/tasks/main.yml

@@ -28,8 +28,8 @@
     mode: 0770
   become: true
   loop:
-    - "{{ opensearch_config_path }}/"
-    - "{{ opensearch_data_path }}/"
+    - "{{ opensearch_config_path }}"
+    - "{{ opensearch_data_path }}"
   when: "'started' in opensearch_state" # don't run during image build
 
 - name: Create certs

ansible/roles/opensearch/templates/opensearch.service.j2

@@ -13,7 +13,12 @@ Restart=always
 # see also https://opensearch.org/docs/2.0/opensearch/install/important-settings/
 ExecStart=/usr/bin/podman run \
     --network=host \
-    --sdnotify=conmon --cgroups=no-conmon -d --replace --name opensearch --restart=no --user opensearch \
+    --sdnotify=conmon \
+    --cgroups=no-conmon \
+    --detach \
+    --replace \
+    --name opensearch \
+    --restart=no --user opensearch \
     --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 \
     --volume {{ opensearch_data_path }}:/usr/share/opensearch/data:U \
     --volume {{ opensearch_config_path }}/internal_users.yml:/usr/share/opensearch/config/opensearch-security/internal_users.yml:U \

docs/monitoring-and-logging.README.md

@@ -11,7 +11,7 @@ Parses log files and ships them to elasticsearch. Note we use the version shippe
 Visualisation tool that supports multiple different datasources. In our stack,
 we use it to visualise prometheus and elasticsearch data.
 
-### [opensearch](https://opendistro.github.io/)
+### [opensearch](https://https://opensearch.org/)
 
 A search engine that provides full text search over a collection of JSON documents. In this project,
 the main use is for the archiving and retrieval of log files.