|
 |
a3a2ad |
From 771e99602c7920b2473706a8bdf2e8a57e1d2aec Mon Sep 17 00:00:00 2001
|
|
|
a3a2ad |
From: Ondrej Mular <omular@redhat.com>
|
|
|
a3a2ad |
Date: Tue, 28 Nov 2017 13:20:16 +0100
|
|
|
a3a2ad |
Subject: [PATCH] change snmp agent logfile path
|
|
|
a3a2ad |
|
|
|
a3a2ad |
---
|
|
|
a3a2ad |
Makefile | 1 -
|
|
|
a3a2ad |
pcs/snmp/pcs_snmp_agent.logrotate | 10 ----------
|
|
|
a3a2ad |
pcs/snmp/settings.py | 2 +-
|
|
|
a3a2ad |
pcsd/pcsd.logrotate | 2 +-
|
|
|
a3a2ad |
4 files changed, 2 insertions(+), 13 deletions(-)
|
|
|
a3a2ad |
delete mode 100644 pcs/snmp/pcs_snmp_agent.logrotate
|
|
|
a3a2ad |
|
|
|
a3a2ad |
diff --git a/Makefile b/Makefile
|
|
|
a3a2ad |
index 04cd62a..5d4aed8 100644
|
|
|
a3a2ad |
--- a/Makefile
|
|
|
a3a2ad |
+++ b/Makefile
|
|
|
a3a2ad |
@@ -129,7 +129,6 @@ install: install_bundled_libs
|
|
|
a3a2ad |
install -d ${SNMP_MIB_DIR_FULL}
|
|
|
a3a2ad |
install -m 644 pcs/snmp/mibs/PCMK-PCS*-MIB.txt ${SNMP_MIB_DIR_FULL}
|
|
|
a3a2ad |
install -m 644 -D pcs/snmp/pcs_snmp_agent.conf ${DESTDIR}/etc/sysconfig/pcs_snmp_agent
|
|
|
a3a2ad |
- install -m 644 -D pcs/snmp/pcs_snmp_agent.logrotate ${DESTDIR}/etc/logrotate.d/pcs_snmp_agent
|
|
|
a3a2ad |
install -m 644 -D pcs/snmp/pcs_snmp_agent.8 ${DESTDIR}/${MANDIR}/man8/pcs_snmp_agent.8
|
|
|
a3a2ad |
ifeq ($(IS_SYSTEMCTL),true)
|
|
|
a3a2ad |
install -d ${DESTDIR}/${systemddir}/system/
|
|
|
a3a2ad |
diff --git a/pcs/snmp/pcs_snmp_agent.logrotate b/pcs/snmp/pcs_snmp_agent.logrotate
|
|
|
a3a2ad |
deleted file mode 100644
|
|
|
a3a2ad |
index a53c21f..0000000
|
|
|
a3a2ad |
--- a/pcs/snmp/pcs_snmp_agent.logrotate
|
|
|
a3a2ad |
+++ /dev/null
|
|
|
a3a2ad |
@@ -1,10 +0,0 @@
|
|
|
a3a2ad |
-/var/log/pcs/snmp/pcs_snmp_agent.log {
|
|
|
a3a2ad |
- rotate 5
|
|
|
a3a2ad |
- weekly
|
|
|
a3a2ad |
- missingok
|
|
|
a3a2ad |
- notifempty
|
|
|
a3a2ad |
- compress
|
|
|
a3a2ad |
- delaycompress
|
|
|
a3a2ad |
- copytruncate
|
|
|
a3a2ad |
- create 0600 root root
|
|
|
a3a2ad |
-}
|
|
|
a3a2ad |
diff --git a/pcs/snmp/settings.py b/pcs/snmp/settings.py
|
|
|
a3a2ad |
index 0559446..5f054ae 100644
|
|
|
a3a2ad |
--- a/pcs/snmp/settings.py
|
|
|
a3a2ad |
+++ b/pcs/snmp/settings.py
|
|
|
a3a2ad |
@@ -4,7 +4,7 @@ from __future__ import (
|
|
|
a3a2ad |
print_function,
|
|
|
a3a2ad |
)
|
|
|
a3a2ad |
|
|
|
a3a2ad |
-LOG_FILE = "/var/log/pcs/pcs_snmp_agent.log"
|
|
|
a3a2ad |
+LOG_FILE = "/var/log/pcsd/pcs_snmp_agent.log"
|
|
|
a3a2ad |
ENTERPRISES_OID = "1.3.6.1.4.1"
|
|
|
a3a2ad |
PACEMAKER_OID = ENTERPRISES_OID + ".32723"
|
|
|
a3a2ad |
PCS_OID = PACEMAKER_OID + ".100"
|
|
|
a3a2ad |
diff --git a/pcsd/pcsd.logrotate b/pcsd/pcsd.logrotate
|
|
|
a3a2ad |
index 36d2529..d105cff 100644
|
|
|
a3a2ad |
--- a/pcsd/pcsd.logrotate
|
|
|
a3a2ad |
+++ b/pcsd/pcsd.logrotate
|
|
|
a3a2ad |
@@ -1,4 +1,4 @@
|
|
|
a3a2ad |
-/var/log/pcsd/pcsd.log {
|
|
|
a3a2ad |
+/var/log/pcsd/*.log {
|
|
|
a3a2ad |
rotate 5
|
|
|
a3a2ad |
weekly
|
|
|
a3a2ad |
missingok
|
|
|
a3a2ad |
--
|
|
|
a3a2ad |
1.8.3.1
|
|
|
a3a2ad |
|