Updated sram-monitor to test both chrome and firefox (closes: SURFscz…

…/SRAM-monitoring#2)

roles/sram_monitor/handlers/main.yml

@@ -1,10 +1,13 @@
 ---
 - name: "enable monitor job"
   systemd:
-    name: "sram-monitor.timer"
+    name: "sram-monitor@{{item}}.timer"
     enabled: true
     state: "started"
     daemon_reload: true
+  loop:
+    - "chrome"
+    - "firefox"
 
 - name: "restart zabbix-agent"
   systemd:

roles/sram_monitor/tasks/main.yml

@@ -47,11 +47,19 @@
 
 - name: Copy monitor service files
   template:
-    src: "{{item}}.j2"
-    dest: "/etc/systemd/system/{{item}}"
-  with_items:
-    - "sram-monitor.service"
-    - "sram-monitor.timer"
+    src: "[email protected]"
+    dest: "/etc/systemd/system/[email protected]"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+
+- name: Copy monitor timer files
+  template:
+    src: "[email protected]"
+    dest: "/etc/systemd/system/sram-monitor@{{ item.browser }}.timer"
+  loop:
+    - { browser: "chrome",  timer: "*:00/20"}
+    - { browser: "firefox", timer: "*:10/20"}
   notify:
     - "enable monitor job"
 

roles/sram_monitor/templates/sram-monitor.service.j2 → roles/sram_monitor/templates/sram-monitor@.service.j2

@@ -1,5 +1,5 @@
 [Unit]
-Description=SRAM Monitor
+Description=SRAM Monitor (%I)
 
 [Service]
 User={{sram_monitor_user}}
@@ -9,5 +9,5 @@ Environment="PATH={{sram_monitor_dir}}/venv/bin/:/usr/bin:/bin"
 PassEnvironment=PATH
 WorkingDirectory={{sram_monitor_dir}}
 
-ExecStart={{sram_monitor_dir}}/run_sram_monitoring.sh prd
-ExecStart={{sram_monitor_dir}}/run_sram_monitoring.sh acc
+ExecStart={{sram_monitor_dir}}/run_sram_monitoring.sh prd %i
+ExecStart={{sram_monitor_dir}}/run_sram_monitoring.sh acc %i

roles/sram_monitor/templates/sram-monitor.timer.j2 → roles/sram_monitor/templates/sram-monitor@.timer.j2

@@ -2,7 +2,7 @@
 Description=SRAM Monitor
 
 [Timer]
-OnCalendar=*:0/15
+OnCalendar={{item.timer}}
 
 [Install]
 WantedBy=multi-user.target