Syslog: add to Nginx more config vars

artefactual-labs · Oct 13, 2021 · e7daa08 · e7daa08
1 parent a5f61e7
commit e7daa08
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -215,8 +215,14 @@ archivematica_src_syslog_server: "localhost"
 archivematica_src_syslog_port: "514"
 archivematica_src_syslog_storageservice_facility: "local0"
 archivematica_src_syslog_storageservice_level: "DEBUG"
+archivematica_src_syslog_storageservice_nginx_identifier: "storage"
+archivematica_src_syslog_storageservice_nginx_facility: "local7"
+archivematica_src_syslog_storageservice_nginx_level: "info"
 archivematica_src_syslog_dashboard_facility: "local1"
 archivematica_src_syslog_dashboard_level: "DEBUG"
+archivematica_src_syslog_dashboard_nginx_identifier: "dashboard"
+archivematica_src_syslog_dashboard_nginx_facility: "local7"
+archivematica_src_syslog_dashboard_nginx_level: "info"
 archivematica_src_syslog_mcpclient_facility: "local2"
 archivematica_src_syslog_mcpclient_level: "DEBUG"
 archivematica_src_syslog_mcpserver_facility: "local3"

diff --git a/templates/etc/nginx/sites-available/dashboard-ssl.conf.j2 b/templates/etc/nginx/sites-available/dashboard-ssl.conf.j2
@@ -15,8 +15,8 @@ server {
   client_max_body_size 256M;
 
 {% if archivematica_src_syslog_enabled|bool and archivematica_src_syslog_nginx_enabled|bool %}
-  access_log syslog:server={{ archivematica_src_syslog_server }},tag=dashboard combined;
-  error_log syslog:server={{ archivematica_src_syslog_server }},tag=dashboard info;
+  access_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_dashboard_nginx_identifier }},facility={{ archivematica_src_syslog_dashboard_nginx_facility }},severity={{ archivematica_src_syslog_dashboard_nginx_level }} combined;
+  error_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_dashboard_nginx_identifier }},facility={{ archivematica_src_syslog_dashboard_nginx_facility }} info;
 {% endif %}
 
 {% if archivematica_src_ssl_include_acme_chlg_loc|bool %}

diff --git a/templates/etc/nginx/sites-available/dashboard.conf.j2 b/templates/etc/nginx/sites-available/dashboard.conf.j2
@@ -15,8 +15,8 @@ server {
   client_max_body_size 256M;
 
 {% if archivematica_src_syslog_enabled|bool and archivematica_src_syslog_nginx_enabled|bool %}
-  access_log syslog:server={{ archivematica_src_syslog_server }},tag=dashboard combined;
-  error_log syslog:server={{ archivematica_src_syslog_server }},tag=dashboard info;
+  access_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_dashboard_nginx_identifier }},facility={{ archivematica_src_syslog_dashboard_nginx_facility }},severity={{ archivematica_src_syslog_dashboard_nginx_level }} combined;
+  error_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_dashboard_nginx_identifier }},facility={{ archivematica_src_syslog_dashboard_nginx_facility }} info;
 {% endif %}
 
   location / {

diff --git a/templates/etc/nginx/sites-available/storage-ssl.conf.j2 b/templates/etc/nginx/sites-available/storage-ssl.conf.j2
@@ -11,8 +11,8 @@ server {
     listen 8000 ssl;
 
 {% if archivematica_src_syslog_enabled|bool and archivematica_src_syslog_nginx_enabled|bool %}
-    access_log syslog:server={{ archivematica_src_syslog_server }},tag=storage combined;
-    error_log syslog:server={{ archivematica_src_syslog_server }},tag=storage info;
+    access_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_storageservice_nginx_identifier }},facility={{ archivematica_src_syslog_storageservice_nginx_facility }},severity={{ archivematica_src_syslog_storageservice_nginx_level }} combined;
+    error_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_storageservice_nginx_identifier }},facility={{ archivematica_src_syslog_storageservice_nginx_facility }} info;
 {% endif %}
 
     ssl_certificate  {{ archivematica_src_ssl_fullchain }};

diff --git a/templates/etc/nginx/sites-available/storage.conf.j2 b/templates/etc/nginx/sites-available/storage.conf.j2
@@ -11,8 +11,8 @@ server {
     listen 8000;
 
 {% if archivematica_src_syslog_enabled|bool %}
-    access_log syslog:server={{ archivematica_src_syslog_server }},tag=storage combined;
-    error_log syslog:server={{ archivematica_src_syslog_server }},tag=storage info;
+    access_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_storageservice_nginx_identifier }},facility={{ archivematica_src_syslog_storageservice_nginx_facility }},severity={{ archivematica_src_syslog_storageservice_nginx_level }} combined;
+    error_log syslog:server={{ archivematica_src_syslog_server }},tag={{ archivematica_src_syslog_storageservice_nginx_identifier }},facility={{ archivematica_src_syslog_storageservice_nginx_facility }} info;
 {% endif %}
 
     # Adjust to taste

diff --git a/templates/etc/rsyslog.d/archivematica.conf.j2 b/templates/etc/rsyslog.d/archivematica.conf.j2
@@ -4,12 +4,12 @@ $template AMLOG,"{{ archivematica_src_syslog_logdir }}/%$YEAR%/%$MONTH%/%$DAY%/%
 $template NGINXAMLOG,"/var/log/archivematica/%$YEAR%/%$MONTH%/%$DAY%/%programname%-access.log"
 $template NGINXAMLOGERROR,"/var/log/archivematica/%$YEAR%/%$MONTH%/%$DAY%/%programname%-error.log"
 
-if (re_match($programname, '(dashboard|storage)') and $syslogseverity-text == 'error') then {
+if (re_match($programname, '({{ archivematica_src_syslog_dashboard_nginx_identifier }}|{{ archivematica_src_syslog_storageservice_nginx_identifier }})') and $syslogseverity-text == 'error') then {
   ?NGINXAMLOGERROR
   stop
 }
 
-if (re_match($programname, '(dashboard|storage)')) then {
+if (re_match($programname, '({{ archivematica_src_syslog_dashboard_nginx_identifier }}|{{ archivematica_src_syslog_storageservice_nginx_identifier }})')) then {
   ?NGINXAMLOG
   stop
 }