Merge pull request #65 from lnls-sirius/update-ti-services

Separate timing IOCs in one IOC per service
lnls-sirius · Feb 6, 2024 · aae067d · aae067d
2 parents c0bc25d + 0a3d925
commit aae067d
Show file tree

Hide file tree

Showing 15 changed files with 369 additions and 24 deletions.
diff --git a/apps/as-ti-general.bash b/apps/as-ti-general.bash
@@ -2,28 +2,7 @@
 
 export PYTHONUNBUFFERED=yes
 
-# CPU usage estimate (ps aux): 26.8%
-
-# sirius-ioc-as-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s as >& /ioc-logs/sirius-ioc-as-ti-trig & # 3.7%
-
-# sirius-ioc-li-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s li >& /ioc-logs/sirius-ioc-li-ti-trig & # 4.2%
-
-# sirius-ioc-tb-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s tb >& /ioc-logs/sirius-ioc-tb-ti-trig & # 4.0%
-
-# sirius-ioc-bo-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s bo >& /ioc-logs/sirius-ioc-bo-ti-trig & # 4.5%
-
-# sirius-ioc-ts-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s ts >& /ioc-logs/sirius-ioc-ts-ti-trig & # 4.5%
-
-# sirius-ioc-si-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s si >& /ioc-logs/sirius-ioc-si-ti-trig & # 5.9%
-
-# sirius-ioc-ba-ti-trig.service
-/usr/local/bin/sirius-ioc-as-ti-control.py -s ba >& /ioc-logs/sirius-ioc-ba-ti-trig & # 5.9%
+/usr/local/bin/sirius-ioc-as-ti-control.py -s as | tee /ioc-logs/sirius-ioc-as-ti-trig & # 3.7%
 
 # run cron for log rotation
 cron &

diff --git a/apps/ba-ti-general.bash b/apps/ba-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s ba | tee /ioc-logs/sirius-ioc-ba-ti-trig & # 5.9%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/apps/bo-ti-general.bash b/apps/bo-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s bo | tee /ioc-logs/sirius-ioc-bo-ti-trig & # 4.5%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/apps/li-ti-general.bash b/apps/li-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s li | tee /ioc-logs/sirius-ioc-li-ti-trig & # 4.2%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/apps/si-ti-general.bash b/apps/si-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s si | tee /ioc-logs/sirius-ioc-si-ti-trig & # 5.9%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/apps/tb-ti-general.bash b/apps/tb-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s tb | tee /ioc-logs/sirius-ioc-tb-ti-trig & # 4.0%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/apps/ts-ti-general.bash b/apps/ts-ti-general.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+/usr/local/bin/sirius-ioc-as-ti-control.py -s ts | tee /ioc-logs/sirius-ioc-ts-ti-trig & # 4.5%
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity
diff --git a/services/docker-stack-as-ti.yml b/services/docker-stack-as-ti.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
 
-  general:
+  as-general:
     image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
     command: bash -c '/ioc-apps/as-ti-general.bash'
     volumes:
@@ -22,6 +22,126 @@ services:
     networks:
       - ioc-network
 
+  li-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/li-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+  tb-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/tb-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+  bo-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/bo-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+  ts-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/ts-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+  si-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/si-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+  ba-general:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/ba-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
   bo-bpms-corrs:
     image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
     command: bash -c '/ioc-apps/bo-ti-bpms-corrs.bash'

diff --git a/services/docker-stack-ba-ti-general.yml b/services/docker-stack-ba-ti-general.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/ba-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"
diff --git a/services/docker-stack-bo-ti-general.yml b/services/docker-stack-bo-ti-general.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/bo-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"
diff --git a/services/docker-stack-li-ti-general.yml b/services/docker-stack-li-ti-general.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/li-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"
diff --git a/services/docker-stack-si-ti-general.yml b/services/docker-stack-si-ti-general.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/si-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"
diff --git a/services/docker-stack-tb-ti-general.yml b/services/docker-stack-tb-ti-general.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/tb-ti-general.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-20RaDiag02-CO-IOCSrv-2
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"