Skip to content
Snippets Groups Projects
Commit 1d3a4ae3 authored by Jörg Sachse's avatar Jörg Sachse
Browse files

fix: make check_ie_sample and move_old_logs services usable

parent 646a9d01
No related branches found
No related tags found
1 merge request!2merge feat_ND-2363_ND-2323 into master
Show whitespace changes
Inline Side-by-side
Showing
with 125 additions and 81 deletions
files/usr/local/bin/move_old_logs.sh
+ 22
− 10
View file @ 1d3a4ae3
...@@ -8,7 +8,10 @@ START_YEAR="2015" ...@@ -8,7 +8,10 @@ START_YEAR="2015"
CURRENT_YEAR="$( date +%Y )" CURRENT_YEAR="$( date +%Y )"
PREVIOUS_YEAR="$(( CURRENT_YEAR - 1 ))" PREVIOUS_YEAR="$(( CURRENT_YEAR - 1 ))"
for APP in disapp subapp subapp_ws; do [[ -n ${1} ]] && APP=${1}
[[ (! ${APP} =~ "disapp") && (! ${APP} =~ "subapp") && (! ${APP} =~ "subapp_webservice") ]] && \
echo 'ERROR: $1 needs to be one of "disapp", "subapp" or "subapp_webservice"'
cd "/var/log/$APP/" || exit 1 cd "/var/log/$APP/" || exit 1
# create directories for old logfiles # create directories for old logfiles
...@@ -18,11 +21,20 @@ for APP in disapp subapp subapp_ws; do ...@@ -18,11 +21,20 @@ for APP in disapp subapp subapp_ws; do
# move all old logfiles # move all old logfiles
for YEAR in $( seq ${START_YEAR} ${PREVIOUS_YEAR} ); do for YEAR in $( seq ${START_YEAR} ${PREVIOUS_YEAR} ); do
if [[ "${APP}" == "disapp" ]]; then
if [[ -n $( find ./ -maxdepth 1 -name "disapp.log.${YEAR}-*.lz" ) ]]; then mv disapp.log.${YEAR}-*.lz "old/${YEAR}/"; fi
fi
if [[ "${APP}" == "subapp" ]]; then
if [[ -n $( find ./ -maxdepth 1 -name "Protokoll_SLUBArchiv_Erfolgreich-${YEAR}*.log" ) ]]; then mv Protokoll_SLUBArchiv_Erfolgreich-${YEAR}*.log "old/${YEAR}/"; fi if [[ -n $( find ./ -maxdepth 1 -name "Protokoll_SLUBArchiv_Erfolgreich-${YEAR}*.log" ) ]]; then mv Protokoll_SLUBArchiv_Erfolgreich-${YEAR}*.log "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "Protokoll_SLUBArchiv_FEHLER-${YEAR}*.log" ) ]]; then mv Protokoll_SLUBArchiv_FEHLER-${YEAR}*.log "old/${YEAR}/"; fi if [[ -n $( find ./ -maxdepth 1 -name "Protokoll_SLUBArchiv_FEHLER-${YEAR}*.log" ) ]]; then mv Protokoll_SLUBArchiv_FEHLER-${YEAR}*.log "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "sips.log.${YEAR}-*.lz" ) ]]; then mv sips.log.${YEAR}-*.lz "old/${YEAR}/"; fi if [[ -n $( find ./ -maxdepth 1 -name "sips.log.${YEAR}-*.lz" ) ]]; then mv sips.log.${YEAR}-*.lz "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "disapp.log.${YEAR}-*.lz" ) ]]; then mv disapp.log.${YEAR}-*.lz "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "subapp.log.${YEAR}-*.lz" ) ]]; then mv subapp.log.${YEAR}-*.lz "old/${YEAR}/"; fi if [[ -n $( find ./ -maxdepth 1 -name "subapp.log.${YEAR}-*.lz" ) ]]; then mv subapp.log.${YEAR}-*.lz "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "producer_mails.log.${YEAR}-*.lz" ) ]]; then mv producer_mails.log.${YEAR}-*.lz "old/${YEAR}/"; fi
if [[ -n $( find ./ -maxdepth 1 -name "staff_mails.log.${YEAR}-*.lz" ) ]]; then mv staff_mails.log.${YEAR}-*.lz "old/${YEAR}/"; fi
fi
if [[ "${APP}" == "subapp_webservice" ]]; then
if [[ -n $( find ./ -maxdepth 1 -name "webservice.log.${YEAR}-*.lz" ) ]]; then mv webservice.log.${YEAR}-*.lz "old/${YEAR}/"; fi if [[ -n $( find ./ -maxdepth 1 -name "webservice.log.${YEAR}-*.lz" ) ]]; then mv webservice.log.${YEAR}-*.lz "old/${YEAR}/"; fi
done fi
done done
files/etc/systemd/user/move_old_logs.timer → files/usr/local/lib/systemd/system/move_old_logs.timer
+ 2
− 2
View file @ 1d3a4ae3
[Unit] [Unit]
Description=timer for move_old_logs.service Description=timer for move_old_logs_@.service
[Timer] [Timer]
# run once a year, on the 1st of January at 05:00:00am. # run once a year, on the 1st of January at 05:00:00am.
OnCalendar=*-1-1 05:00:00 OnCalendar=*-1-1 05:00:00
Unit=move_old_logs.service Unit=move_old_logs_@.service
[Install] [Install]
WantedBy=default.target WantedBy=default.target
tasks/install_move_logs.yml
+ 64
− 26
View file @ 1d3a4ae3
--- ---
- name: disable legacy SystemD units
ansible.builtin.systemd:
unit: "{{ item }}"
state: stopped
enabled: false
loop:
- "move_old_logs.service"
- "move_old_logs.timer"
ignore_errors: true
- name: remove legacy timer/service/script
ansible.builtin.file:
path: "{{ item }}"
state: absent
loop:
- "/etc/systemd/user/move_old_logs.timer"
- "/etc/systemd/user/move_old_logs.service"
- "/usr/local/bin/move_old_logs.sh"
####################################################################################################################
- name: create SystemD unit directory
ansible.builtin.file:
path: "/usr/local/lib/systemd/system/"
state: directory
mode: "0755"
- name: install timer and script for moving old logs to archive - name: install timer and script for moving old logs to archive
ansible.builtin.copy: ansible.builtin.copy:
src: "{{ item.path }}" src: "{{ item.path }}"
...@@ -7,7 +33,7 @@ ...@@ -7,7 +33,7 @@
owner: "{{ item.owner | default('root') }}" owner: "{{ item.owner | default('root') }}"
group: "{{ item.group | default('root') }}" group: "{{ item.group | default('root') }}"
loop: loop:
- path: "etc/systemd/user/move_old_logs.timer" - path: "usr/local/lib/systemd/system/move_old_logs.timer"
mode: "0644" mode: "0644"
- path: "usr/local/bin/move_old_logs.sh" - path: "usr/local/bin/move_old_logs.sh"
mode: "0755" mode: "0755"
...@@ -15,37 +41,49 @@ ...@@ -15,37 +41,49 @@
- name: install service for moving old logs to archive - name: install service for moving old logs to archive
ansible.builtin.template: ansible.builtin.template:
src: "etc/systemd/user/move_old_logs.service.j2" src: "usr/local/lib/systemd/system/move_old_logs_@.service.j2"
dest: "/etc/systemd/user/move_old_logs.service" dest: "/usr/local/lib/systemd/system/move_old_logs_@.service"
mode: "0755" mode: "0755"
owner: "root" owner: "root"
group: "root" group: "root"
notify: daemon-reload
- name: find move_old_logs systemd units so we don't have to hardcode their names in the loops - name: enable move_old_logs services
ansible.builtin.find: ansible.builtin.systemd:
path: "/etc/systemd/user/" name: "move_old_logs_@{{ item }}.service"
pattern: "move_old_logs.*" daemon_reload: true
register: move_old_logs_units enabled: true
loop:
- name: check if move_old_logs units are already enabled - "disapp"
ansible.builtin.command: "systemctl is-enabled {{ item.path | basename }}" - "subapp"
loop: "{{ move_old_logs_units.files }}" - "subapp_webservice"
register: move_old_logs_enabled
changed_when: false
failed_when:
- move_old_logs_enabled.stdout != "enabled"
- move_old_logs_enabled.stdout != "disabled"
- '"No such file or directory" not in move_old_logs_enabled.stderr'
- name: manually enable move_old_logs.service, because it cannot be found by the ansible.builtin.systemd module when the timer is located below "/etc/systemd/user/"
ansible.builtin.command: "systemctl enable {{ item.item.path }}"
loop: "{{ move_old_logs_enabled.results }}"
when:
- item.stdout != "enabled"
register: move_old_logs_enablecmd
changed_when: move_old_logs_enablecmd.stdout in "Created symlink"
- name: start timer for moving old logs to archive (the service is triggered by the timer and doesn't need to be started separately) - name: start timer for moving old logs to archive (the service is triggered by the timer and doesn't need to be started separately)
ansible.builtin.systemd: ansible.builtin.systemd:
name: "move_old_logs.timer" name: "move_old_logs.timer"
enabled: true
state: started state: started
#- name: find move_old_logs systemd units so we don't have to hardcode their names in the loops
# ansible.builtin.find:
# path: "/usr/local/lib/systemd/system/"
# pattern: "move_old_logs.*"
# register: move_old_logs_units
#
#- name: check if move_old_logs units are already enabled
# ansible.builtin.command: "systemctl is-enabled {{ item.path | basename }}"
# loop: "{{ move_old_logs_units.files }}"
# register: move_old_logs_enabled
# changed_when: false
# failed_when:
# - move_old_logs_enabled.stdout != "enabled"
# - move_old_logs_enabled.stdout != "disabled"
# - '"No such file or directory" not in move_old_logs_enabled.stderr'
#
#- name: manually enable move_old_logs.service, because it cannot be found by the ansible.builtin.systemd module when the timer is located below "/etc/systemd/user/"
# ansible.builtin.command: "systemctl enable {{ item.item.path }}"
# loop: "{{ move_old_logs_enabled.results }}"
# when:
# - item.stdout != "enabled"
# register: move_old_logs_enablecmd
# changed_when: move_old_logs_enablecmd.stdout in "Created symlink"
tasks/install_subapp.yml
+ 26
− 25
View file @ 1d3a4ae3
...@@ -254,11 +254,13 @@ ...@@ -254,11 +254,13 @@
- "/etc/systemd/user/stichprobe-daily-report.timer" - "/etc/systemd/user/stichprobe-daily-report.timer"
- "/etc/systemd/user/stichprobe-daily-report.service" - "/etc/systemd/user/stichprobe-daily-report.service"
- "/home/{{ vault_subapp_user }}/.subapp/stichprobe.ini" - "/home/{{ vault_subapp_user }}/.subapp/stichprobe.ini"
- "/etc/systemd/user/check_ie_sample.timer"
- "/etc/systemd/user/check_ie_sample.service"
- name: check_ie_sample Timer - name: deploy check_ie_sample Service
ansible.builtin.template: ansible.builtin.template:
src: "check_ie_sample.timer.j2" src: "usr/local/lib/systemd/system/check_ie_sample.service.j2"
dest: "/etc/systemd/user/check_ie_sample.timer" dest: "/usr/local/lib/systemd/system/check_ie_sample.service"
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
...@@ -266,10 +268,10 @@ ...@@ -266,10 +268,10 @@
when: ansible_hostname == item.key when: ansible_hostname == item.key
no_log: true no_log: true
- name: check_ie_sample Service - name: deploy check_ie_sample Timer
ansible.builtin.template: ansible.builtin.template:
src: "check_ie_sample.service.j2" src: "usr/local/lib/systemd/system/check_ie_sample.timer.j2"
dest: "/etc/systemd/user/check_ie_sample.service" dest: "/usr/local/lib/systemd/system/check_ie_sample.timer"
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
...@@ -277,22 +279,21 @@ ...@@ -277,22 +279,21 @@
when: ansible_hostname == item.key when: ansible_hostname == item.key
no_log: true no_log: true
# - name: enable check_ie_sample Service - name: enable check_ie_sample Service
# ansible.builtin.command: "systemctl enable /etc/systemd/user/check_ie_sample.service" ansible.builtin.systemd:
# loop: "{{ lookup('dict', vault_stichprobe_hosts) }}" unit: "check_ie_sample.service"
# when: ansible_hostname == item.key enabled: true
# no_log: true daemon_reload: true
# loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
# - name: enable check_ie_sample Timers when: ansible_hostname == item.key
# ansible.builtin.command: "systemctl enable /etc/systemd/user/check_ie_sample.timer" no_log: true
# loop: "{{ lookup('dict', vault_stichprobe_hosts) }}"
# when: ansible_hostname == item.key - name: enable & start check_ie_sample Timer
# no_log: true ansible.builtin.systemd:
# unit: "check_ie_sample.timer"
# - name: restart check_ie_sample Timers enabled: true
# ansible.builtin.systemd: state: restarted
# name: "check_ie_sample.timer" daemon_reload: true
# state: restarted loop: "{{ lookup('dict', vault_check_ie_sample_hosts) }}"
# loop: "{{ lookup('dict', vault_stichprobe_hosts) }}" when: ansible_hostname == item.key
# when: ansible_hostname == item.key no_log: true
# ignore_errors: true
templates/check_ie_sample.service.j2 → templates/usr/local/lib/systemd/system/check_ie_sample.service.j2
+ 3
− 2
View file @ 1d3a4ae3
[Unit] [Unit]
Description=service: daily report from stichprobe, institute {{ item.value.institute_name }} Description=service: daily report for sampling {{ item.value.institute_name }} workflows
Documentation=perldoc /usr/local/bin/check_ie_sample.pl Documentation=perldoc /usr/local/bin/check_ie_sample.pl
[Service] [Service]
Type=oneshot Type=oneshot
Restart=no Restart=no
ExecStart=/usr/bin/perl -I /usr/local/perl /usr/local/bin/check_ie_sample.pl --institute {{ item.value.institute_name }} --email langzeitarchiv@slub-dresden.de --host {{ item.value.rosetta_host }} --user {{ item.value.user }} --password {{ item.value.password }} --sampling_factor 0.001 ExecStart=/usr/bin/perl -I /usr/local/perl /usr/local/bin/check_ie_sample.pl --institute {{ item.value.institute_name }} --email langzeitarchiv@slub-dresden.de --host {{ item.value.rosetta_host }}.slub-dresden.de --user {{ item.value.user }} --password {{ item.value.password }} --sampling_factor 0.0000274
# Sampling factor = 1/100/365
User={{ vault_subapp_user }} User={{ vault_subapp_user }}
Group={{ vault_subapp_group }} Group={{ vault_subapp_group }}
......
templates/check_ie_sample.timer.j2 → templates/usr/local/lib/systemd/system/check_ie_sample.timer.j2
+ 3
− 5
View file @ 1d3a4ae3
[Unit] [Unit]
Description=timer: daily report for stichprobe {{ item.value.institute_name }} workflows Description=timer: daily report for sampling {{ item.value.institute_name }} workflows
Documentation=perldoc /usr/local/bin/check_ie_sample.pl Documentation=perldoc /usr/local/bin/check_ie_sample.pl
[Timer] [Timer]
OnCalendar=monthly OnCalendar=daily
#RandomizedDelaySec=14400 #RandomizedDelaySec=14400
# run every x minutes/hours/days
#OnUnitActiveSec={{ item.value.timer_interval }}
#Wake system from suspend mode #Wake system from suspend mode
WakeSystem=true WakeSystem=true
#When activated, it triggers the service immediately if it missed the last start time, for example due to the system being powered off #When activated, it triggers the service immediately if it missed the last start time, for example due to the system being powered off
Persistent=true Persistent=true
#Unit to activate when the timer elapses. (default is set to the same name as the timer unit, except for the suffix) #Unit to activate when the timer elapses. (default is set to the same name as the timer unit, except for the suffix)
Unit=stichprobe-daily-report.service Unit=check_ie_sample.service
[Install] [Install]
#is requires to activate the timer permanently #is requires to activate the timer permanently
......
templates/etc/systemd/user/move_old_logs.service.j2 → templates/usr/local/lib/systemd/system/move_old_logs_@.service.j2
+ 4
− 4
View file @ 1d3a4ae3
[Unit] [Unit]
Description=move_old_logs.sh Description=Daemon to move old logfiles from previous year to archive (%i)
After=remote-fs.target After=remote-fs.target
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/local/bin/move_old_logs.sh ExecStart=/usr/local/bin/move_old_logs.sh %i
User={{ vault_subapp_user }} User=root
Group={{ vault_subapp_group }} Group=root
### Security features ### Security features
# documented at https://www.freedesktop.org/software/systemd/man/systemd.exec.html # documented at https://www.freedesktop.org/software/systemd/man/systemd.exec.html
......
vars/stichprobe.vault.example
+ 1
− 7
View file @ 1d3a4ae3
...@@ -13,16 +13,10 @@ vault_stichprobe_hosts: ...@@ -13,16 +13,10 @@ vault_stichprobe_hosts:
# <name-of-subapp-server>: # <name-of-subapp-server>:
# host: "<Rosetta-Webservice-API-Hostname>" # host: "<Rosetta-Webservice-API-Hostname>"
# user: "<Rosetta-Submission-Agent-Username>" # user: "<Rosetta-Submission-Agent-Username>"
# password: !vault | # password: "Sw0rdF!5h"
# $ANSIBLE_VAULT;1.1;AES256
# 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
# email: "recipients@example.com" # email: "recipients@example.com"
# institute_name: "<name-of-institution-as-given-in-Rosetta>" # institute_name: "<name-of-institution-as-given-in-Rosetta>"
# institute_code: "<code-of-institution-as-given-in-Rosetta>" # institute_code: "<code-of-institution-as-given-in-Rosetta>"
# institute_dead_ref_process_id: "<Rosetta-Process-ID-for Dead-Reference-Identification-Job>" # institute_dead_ref_process_id: "<Rosetta-Process-ID-for Dead-Reference-Identification-Job>"
# institute_fixity_check_process_id: "<Rosetta-Process-ID-for-Fixity-Check-Job>" # institute_fixity_check_process_id: "<Rosetta-Process-ID-for-Fixity-Check-Job>"
# institute_department: "<space-separated-list-of-Rosetta-Departments-like-CONSORTIUM.INS.DEPT>" # institute_department: "<space-separated-list-of-Rosetta-Departments-like-CONSORTIUM.INS.DEPT>"
# timer_interval: "<timer-interval-in-systemd-time-syntax>"
# # timer_interval: "{{ ( (24 * 60 * 60) / (<Number_of-IEs> / 36500) ) + 1 | round(0,'floor') | int }} seconds"
# # timer_interval: "{{ ( (24h * 60min * 60sec) / (<Number-of-IEs> / (365days / 100)) ) + 1 | round(0,'floor') | int }} seconds" # Timer Interval explained
# # documented at https://www.freedesktop.org/software/systemd/man/systemd.time.html
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

DE: Impressum · Datenschutzerklärung | EN: Legal Notice · Privacy Policy