[skywalking-terraform] branch main updated: Implement env variables support for WebUI systemd unit file (#12)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-terraform.git


The following commit(s) were added to refs/heads/main by this push:
     new dad4e8d  Implement env variables support for WebUI systemd unit file 
(#12)
dad4e8d is described below

commit dad4e8dae4589b3e5bf1d389dc9d822d45c26320
Author: Rahul Bajaj <rahulrb0...@gmail.com>
AuthorDate: Mon Jul 31 00:01:20 2023 -0400

    Implement env variables support for WebUI systemd unit file (#12)
---
 ansible/roles/skywalking/tasks/main.yml                     | 7 +++++++
 ansible/roles/skywalking/templates/skywalking-ui.service.j2 | 9 ++++++---
 ansible/roles/skywalking/vars/main.yml                      | 9 +++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/skywalking/tasks/main.yml 
b/ansible/roles/skywalking/tasks/main.yml
index 6ab249b..b70cbc3 100644
--- a/ansible/roles/skywalking/tasks/main.yml
+++ b/ansible/roles/skywalking/tasks/main.yml
@@ -73,6 +73,13 @@
     mode: "0660"
   when: inventory_hostname in groups['skywalking-ui']
 
+- name: Registration of OAP Server address within WebUI environment file
+  ansible.builtin.lineinfile:
+    path: "{{ env_file }}"
+    line: "{{ item.key }}={{ item.value }}"
+    create: yes
+  loop: "{{ sw_ui_env_vars|dict2items }}"
+
 - name: Reload systemd
   systemd:
     daemon_reload: yes
diff --git a/ansible/roles/skywalking/templates/skywalking-ui.service.j2 
b/ansible/roles/skywalking/templates/skywalking-ui.service.j2
index 76e3e77..a8ade7a 100644
--- a/ansible/roles/skywalking/templates/skywalking-ui.service.j2
+++ b/ansible/roles/skywalking/templates/skywalking-ui.service.j2
@@ -14,14 +14,17 @@
 # limitations under the License.
 
 [Unit]
-Description=Apache SkyWalking UI Service
+Description=Apache SkyWalking WebUI Service
 After=network.target
 
 [Service]
 Type=simple
+EnvironmentFile=/usr/local/skywalking/webapp/webui_env
 ExecStart=/usr/local/skywalking/bin/webappService.sh
-ExecStop=/bin/kill -SIGTERM $MAINPID
-Restart=always
+TimeoutSec=300
+KillMode=process
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ansible/roles/skywalking/vars/main.yml 
b/ansible/roles/skywalking/vars/main.yml
index 7842f3a..9ecada0 100644
--- a/ansible/roles/skywalking/vars/main.yml
+++ b/ansible/roles/skywalking/vars/main.yml
@@ -15,3 +15,12 @@
 
 ---
 skywalking_version: "9.5.0"
+sw_ui_server_port: "8080"
+sw_oap_server_port: "12800"
+sw_zipkin_address: "9412"
+
+sw_ui_env_vars:
+  SW_SERVER_PORT: "{{ sw_ui_server_port }}"
+  SW_OAP_ADDRESS: "{% for host in groups['skywalking-oap'] %}http://{{ 
hostvars[host].ansible_host }}:{{ sw_oap_server_port }}{% if not loop.last 
%},{% endif %}{% endfor %}}"
+  SW_ZIPKIN_ADDEESS: "{% for host in groups['skywalking-oap'] %}http://{{ 
hostvars[host].ansible_host }}:{{ sw_zipkin_address }}{% if not loop.last %},{% 
endif %}{% endfor %}}"
+env_file: /usr/local/skywalking/webapp/sw_ui_env_file