pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 680467 from home:dmdiss:bsc1077777_pcp_43_drop_python2

Browse Source 
- Upgrade to 4.3.1; (bsc#1127437).
- Drop upstreamed patches:
  0004-create-pmlogger-and-pmie-logdirs-during-install.patch
  0007-pmie-add-systemd-timers-as-cron-alternative.patch
  0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch
  0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch
  0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch

- Drop python2 support for Factory and SLES15-SP1; (bsc#1077777).

OBS-URL: https://build.opensuse.org/request/show/680467
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=75
This commit is contained in:
David Disseldorp 2019-03-01 11:41:32 +00:00 committed by Git OBS Bridge
parent 39af90dafd
commit e43865979e
10 changed files with 39 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0004-create-pmlogger-and-pmie-logdirs-during-install.patch
View File

@ -1,39 +0,0 @@
From 2579ef49525c6de11b2ee543196d1719928b38ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:46:47 +0100
Subject: [PATCH 4/6] create pmlogger and pmie logdirs during install
---
src/pmie/GNUmakefile | 2 ++
src/pmlogger/GNUmakefile | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index 6c4eb0edb0c8..e27f2968dace 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -58,6 +58,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts /etc/cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmie/crontab.docker
$(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)`
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie
+ $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie
endif
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
index 572b4af832fd..75af514d55a4 100644
--- a/src/pmlogger/GNUmakefile
+++ b/src/pmlogger/GNUmakefile
@@ -65,6 +65,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmlogger/crontab.docker
$(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)`
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger
+ $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger
endif
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
$(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh
--
2.18.0

137
0007-pmie-add-systemd-timers-as-cron-alternative.patch
View File

@ -1,137 +0,0 @@
From 7264f3bee5f1c9bf2fc666ca2a862c25b1173992 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 7 Jan 2019 01:27:54 +0100
Subject: [PATCH] pmie: add systemd timers as cron alternative
The pmie_check and pmie_daily check timer/service files are
installed by default with ENABLE_SYSTEMD. crontab.docker is kept as-is.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
src/pmie/GNUmakefile | 22 ++++++++++++++++++++--
src/pmie/pmie_check.service.in | 8 ++++++++
src/pmie/pmie_check.timer | 10 ++++++++++
src/pmie/pmie_daily.service.in | 8 ++++++++
src/pmie/pmie_daily.timer | 8 ++++++++
5 files changed, 54 insertions(+), 2 deletions(-)
create mode 100644 src/pmie/pmie_check.service.in
create mode 100644 src/pmie/pmie_check.timer
create mode 100644 src/pmie/pmie_daily.service.in
create mode 100644 src/pmie/pmie_daily.timer
Index: pcp/src/pmie/GNUmakefile
===================================================================
--- pcp.orig/src/pmie/GNUmakefile
+++ pcp/src/pmie/GNUmakefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/src/include/builddefs
SUBDIRS = src examples
OTHERS = control stomp rc_pmie pmie2col.sh pmie_check.sh pmie_daily.sh
-LDIRT = crontab crontab.docker pmie.service
+LDIRT = crontab crontab.docker pmie.service pmie_daily.service pmie_check.service
ifeq ($(TARGET_OS),linux)
CRONTAB_USER = $(PCP_USER)
@@ -28,7 +28,7 @@ CRONTAB_USER =
CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmie/crontab
endif
-default:: crontab crontab.docker pmie.service
+default:: crontab crontab.docker pmie.service pmie_daily.service pmie_check.service
default:: $(SUBDIRS)
$(SUBDIRS_MAKERULE)
@@ -50,6 +50,10 @@ endif
$(INSTALL) -m 755 rc_pmie $(PCP_RC_DIR)/pmie
ifeq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 pmie.service $(PCP_SYSTEMDUNIT_DIR)/pmie.service
+ $(INSTALL) -m 644 pmie_daily.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.timer
+ $(INSTALL) -m 644 pmie_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.service
+ $(INSTALL) -m 644 pmie_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_check.timer
+ $(INSTALL) -m 644 pmie_check.service $(PCP_SYSTEMDUNIT_DIR)/pmie_check.service
endif
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_LOG_DIR)/pmie
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmie
@@ -61,7 +65,9 @@ ifeq ($(TARGET_OS),linux)
$(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie
endif
+ifneq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
+endif
include $(BUILDRULES)
@@ -75,6 +81,18 @@ pmie.service : pmie.service.in
-e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \
# END
+pmie_check.service : pmie_check.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ # END
+
+pmie_daily.service : pmie_daily.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ # END
+
crontab: crontab.in
$(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';g' $< > $@
Index: pcp/src/pmie/pmie_check.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmie/pmie_check.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Check PMIE instances are running
+Documentation=man:pmie(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmie_check -C
+User=@PCP_USER@
Index: pcp/src/pmie/pmie_check.timer
===================================================================
--- /dev/null
+++ pcp/src/pmie/pmie_check.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Half-hourly check of PMIE instances
+
+[Timer]
+OnCalendar=*-*-* *:28:00
+OnCalendar=*-*-* *:58:00
+
+[Install]
+WantedBy=timers.target
+
Index: pcp/src/pmie/pmie_daily.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmie/pmie_daily.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Process PMIE logs
+Documentation=man:pmie(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmie_daily -X xz -x 3
+User=@PCP_USER@
Index: pcp/src/pmie/pmie_daily.timer
===================================================================
--- /dev/null
+++ pcp/src/pmie/pmie_daily.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Daily processing of PMIE logs
+
+[Timer]
+OnCalendar=*-*-* 00:08:00
+
+[Install]
+WantedBy=timers.target

176
0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch
View File

@ -1,176 +0,0 @@
From 4482bde0673fe1e548060a5c7ef6f58cf43209c3 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 7 Jan 2019 02:07:01 +0100
Subject: [PATCH] pmlogger_daily: add systemd timers as cron alternative
The timer and service files are installed by default with
ENABLE_SYSTEMD. crontab.docker is kept as-is.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
src/pmlogger/GNUmakefile | 32 ++++++++++++++++++++++++++--
src/pmlogger/pmlogger_daily.service.in | 8 +++++++
src/pmlogger/pmlogger_daily.timer | 8 +++++++
src/pmlogger/pmlogger_daily_check.service.in | 8 +++++++
src/pmlogger/pmlogger_daily_check.timer | 9 ++++++++
src/pmlogger/pmlogger_daily_poll.service.in | 8 +++++++
src/pmlogger/pmlogger_daily_poll.timer | 8 +++++++
7 files changed, 79 insertions(+), 2 deletions(-)
create mode 100644 src/pmlogger/pmlogger_daily.service.in
create mode 100644 src/pmlogger/pmlogger_daily.timer
create mode 100644 src/pmlogger/pmlogger_daily_check.service.in
create mode 100644 src/pmlogger/pmlogger_daily_check.timer
create mode 100644 src/pmlogger/pmlogger_daily_poll.service.in
create mode 100644 src/pmlogger/pmlogger_daily_poll.timer
Index: pcp/src/pmlogger/GNUmakefile
===================================================================
--- pcp.orig/src/pmlogger/GNUmakefile
+++ pcp/src/pmlogger/GNUmakefile
@@ -20,7 +20,9 @@ SUBDIRS = src
OTHERS = pmnewlog.sh control rc_pmlogger \
pmlogger_daily.sh pmlogger_check.sh pmlogger_merge.sh pmlogmv.sh \
pmlogger_daily_report.sh pmlogger_rewrite.sh
-LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service
+LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service \
+ pmlogger_daily.service pmlogger_daily_poll.service \
+ pmlogger_daily_check.service
ifeq ($(TARGET_OS),linux)
CRONTAB_USER = $(PCP_USER)
@@ -31,7 +33,7 @@ CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmlogg
endif
CRONTAB_DAILY_REPORT_PATH = $(CRONTAB_PATH)-daily-report
-default:: crontab crontab.docker pmlogger.service crontab.daily_report
+default:: $(LDIRT)
default:: $(SUBDIRS)
$(SUBDIRS_MAKERULE)
@@ -57,6 +59,12 @@ endif
$(INSTALL) -m 755 rc_pmlogger $(PCP_RC_DIR)/pmlogger
ifeq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 pmlogger.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger.service
+ $(INSTALL) -m 644 pmlogger_daily.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily.timer
+ $(INSTALL) -m 644 pmlogger_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily.service
+ $(INSTALL) -m 644 pmlogger_daily_poll.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_poll.timer
+ $(INSTALL) -m 644 pmlogger_daily_poll.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_poll.service
+ $(INSTALL) -m 644 pmlogger_daily_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_check.timer
+ $(INSTALL) -m 644 pmlogger_daily_check.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_check.service
endif
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_LOG_DIR)/pmlogger
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmlogger
@@ -68,7 +76,9 @@ ifeq ($(TARGET_OS),linux)
$(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger
endif
+ifneq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
+endif
$(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh
$(INSTALL) -m 755 pmlogger_daily_report.sh $(PCP_BINADM_DIR)/pmlogger_daily_report$(SHELLSUFFIX)
$(INSTALL) -m 644 crontab.daily_report $(CRONTAB_DAILY_REPORT_PATH)
@@ -86,6 +96,24 @@ pmlogger.service : pmlogger.service.in
-e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \
# END
+pmlogger_daily.service : pmlogger_daily.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ # END
+
+pmlogger_daily_poll.service : pmlogger_daily_poll.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ # END
+
+pmlogger_daily_check.service : pmlogger_daily_check.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ # END
+
crontab : crontab.in
$(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';' $< > $@
Index: pcp/src/pmlogger/pmlogger_daily.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Process archive logs
+Documentation=man:pmlogger(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmlogger_daily
+User=@PCP_USER@
Index: pcp/src/pmlogger/pmlogger_daily.timer
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Daily processing of archive logs
+
+[Timer]
+OnCalendar=*-*-* 00:10:00
+
+[Install]
+WantedBy=timers.target
Index: pcp/src/pmlogger/pmlogger_daily_check.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_check.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Check pmlogger instances are running
+Documentation=man:pmlogger(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmlogger_daily -C
+User=@PCP_USER@
Index: pcp/src/pmlogger/pmlogger_daily_check.timer
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_check.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Half-hourly check of pmlogger instances
+
+[Timer]
+OnCalendar=*-*-* *:25:00
+OnCalendar=*-*-* *:55:00
+
+[Install]
+WantedBy=timers.target
Index: pcp/src/pmlogger/pmlogger_daily_poll.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_poll.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Poll log processing
+Documentation=man:pmlogger(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmlogger_daily -p
+User=@PCP_USER@
Index: pcp/src/pmlogger/pmlogger_daily_poll.timer
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_poll.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Hourly polling of log processing
+
+[Timer]
+OnCalendar=*-*-* *:30:00
+
+[Install]
+WantedBy=timers.target

129
0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch
View File

@ -1,129 +0,0 @@
From f026b0e562172e05fd2753caad2ae41e390cad90 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 7 Jan 2019 13:24:52 +0100
Subject: [PATCH] pmlogger_daily_report: add systemd timers as cron alternative
The timer and service files are installed by default with
ENABLE_SYSTEMD.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
src/pmlogger/GNUmakefile | 23 +++++++++++++++++++++-
src/pmlogger/pmlogger_daily_report.service.in | 8 ++++++++
src/pmlogger/pmlogger_daily_report.timer | 8 ++++++++
src/pmlogger/pmlogger_daily_report_poll.service.in | 8 ++++++++
src/pmlogger/pmlogger_daily_report_poll.timer | 8 ++++++++
5 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 src/pmlogger/pmlogger_daily_report.service.in
create mode 100644 src/pmlogger/pmlogger_daily_report.timer
create mode 100644 src/pmlogger/pmlogger_daily_report_poll.service.in
create mode 100644 src/pmlogger/pmlogger_daily_report_poll.timer
Index: pcp/src/pmlogger/GNUmakefile
===================================================================
--- pcp.orig/src/pmlogger/GNUmakefile
+++ pcp/src/pmlogger/GNUmakefile
@@ -22,7 +22,8 @@ OTHERS = pmnewlog.sh control rc_pmlogger
pmlogger_daily_report.sh pmlogger_rewrite.sh
LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service \
pmlogger_daily.service pmlogger_daily_poll.service \
- pmlogger_daily_check.service
+ pmlogger_daily_check.service pmlogger_daily_report.service \
+ pmlogger_daily_report_poll.service
ifeq ($(TARGET_OS),linux)
CRONTAB_USER = $(PCP_USER)
@@ -65,6 +66,10 @@ ifeq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 pmlogger_daily_poll.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_poll.service
$(INSTALL) -m 644 pmlogger_daily_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_check.timer
$(INSTALL) -m 644 pmlogger_daily_check.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_check.service
+ $(INSTALL) -m 644 pmlogger_daily_report.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report.timer
+ $(INSTALL) -m 644 pmlogger_daily_report.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report.service
+ $(INSTALL) -m 644 pmlogger_daily_report_poll.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report_poll.timer
+ $(INSTALL) -m 644 pmlogger_daily_report_poll.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report_poll.service
endif
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_LOG_DIR)/pmlogger
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmlogger
@@ -81,7 +86,9 @@ ifneq ($(ENABLE_SYSTEMD),true)
endif
$(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh
$(INSTALL) -m 755 pmlogger_daily_report.sh $(PCP_BINADM_DIR)/pmlogger_daily_report$(SHELLSUFFIX)
+ifneq ($(ENABLE_SYSTEMD),true)
$(INSTALL) -m 644 crontab.daily_report $(CRONTAB_DAILY_REPORT_PATH)
+endif
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_SA_DIR)
include $(BUILDRULES)
@@ -114,6 +121,20 @@ pmlogger_daily_check.service : pmlogger_
-e 's;@PCP_USER@;'$(PCP_USER)';' \
# END
+pmlogger_daily_report.service : pmlogger_daily_report.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \
+ # END
+
+pmlogger_daily_report_poll.service : pmlogger_daily_report_poll.service.in
+ $(SED) <$< >$@ \
+ -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
+ -e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \
+ # END
+
crontab : crontab.in
$(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';' $< > $@
Index: pcp/src/pmlogger/pmlogger_daily_report.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_report.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Generate system activity reports
+Documentation=man:pmlogger(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report -o @PCP_SA_DIR@
+User=@PCP_USER@
Index: pcp/src/pmlogger/pmlogger_daily_report.timer
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_report.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Daily generation of system activity reports
+
+[Timer]
+OnCalendar=*-*-* 02:00:00
+
+[Install]
+WantedBy=timers.target
Index: pcp/src/pmlogger/pmlogger_daily_report_poll.service.in
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_report_poll.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Poll system activity report generation
+Documentation=man:pmlogger(1)
+
+[Service]
+Type=oneshot
+ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report -o @PCP_SA_DIR@ -p
+User=@PCP_USER@
Index: pcp/src/pmlogger/pmlogger_daily_report_poll.timer
===================================================================
--- /dev/null
+++ pcp/src/pmlogger/pmlogger_daily_report_poll.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Hourly polling of system activity report generation
+
+[Timer]
+OnCalendar=*-*-* *:30:00
+
+[Install]
+WantedBy=timers.target

53
0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch
View File

@ -1,53 +0,0 @@
From b591bf4f9f73f11d012e40f4860a8635b4096977 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Tue, 15 Jan 2019 01:15:45 +0100
Subject: [PATCH] pmns: don't package .NeedRebuild for SUSE distros
.NeedRebuild creation is handled by rpm scripts.
This change also fixes the target_distro configure check for modern
[open]SUSE distros, which only include /etc/os-release.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
configure | 1 +
configure.ac | 1 +
src/pmns/GNUmakefile | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
Index: pcp-4.3.0/configure
===================================================================
--- pcp-4.3.0.orig/configure
+++ pcp-4.3.0/configure
@@ -3324,6 +3324,7 @@ then
$as_echo "#define IS_LINUX 1" >>confdefs.h
test -f /etc/SuSE-release && target_distro=suse
+ grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse
test -f /etc/fedora-release && target_distro=fedora
test -f /etc/redhat-release && target_distro=redhat
test -f /etc/debian_version && target_distro=debian
Index: pcp-4.3.0/configure.ac
===================================================================
--- pcp-4.3.0.orig/configure.ac
+++ pcp-4.3.0/configure.ac
@@ -281,6 +281,7 @@ if test $target_os = linux
then
AC_DEFINE(IS_LINUX, [1], [Platform is Linux])
test -f /etc/SuSE-release && target_distro=suse
+ grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse
test -f /etc/fedora-release && target_distro=fedora
test -f /etc/redhat-release && target_distro=redhat
test -f /etc/debian_version && target_distro=debian
Index: pcp-4.3.0/src/pmns/GNUmakefile
===================================================================
--- pcp-4.3.0.orig/src/pmns/GNUmakefile
+++ pcp-4.3.0/src/pmns/GNUmakefile
@@ -60,7 +60,7 @@ install: default
$(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild
$(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid
$(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR)
-ifeq (, $(filter redhat debian, $(PACKAGE_DISTRIBUTION)))
+ifneq "$(TARGET_OS)" "linux"
$(INSTALL) -m 644 .NeedRebuild $(PMNS_VAR_DIR)/.NeedRebuild
endif

2
_service
View File

@ -3,7 +3,7 @@
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/performancecopilot/pcp.git</param> <param name="url">https://github.com/performancecopilot/pcp.git</param>
<param name="filename">pcp</param> <param name="filename">pcp</param>
<param name="revision">4.3.0</param> <param name="revision">4.3.1</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param> <param name="changesgenerate">disable</param>
</service> </service>

3
pcp-4.3.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43ab5abad97f1e3fe3171ff523dca1fc5f02dabd0ae56ca42c20b149c7a09262
size 32191943

3
pcp-4.3.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5d132e053fe1ed9c1596111c868fc5c8e2d535a332cf9c612440be586c559ff
size 32269284

16
pcp.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Feb 28 23:04:12 UTC 2019 - ddiss@suse.com
- Upgrade to 4.3.1; (bsc#1127437).
- Drop upstreamed patches:
0004-create-pmlogger-and-pmie-logdirs-during-install.patch
0007-pmie-add-systemd-timers-as-cron-alternative.patch
0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch
0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch
0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch
-------------------------------------------------------------------
Tue Feb 19 14:19:03 UTC 2019 - ddiss@suse.com
- Drop python2 support for Factory and SLES15-SP1; (bsc#1077777).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 6 14:21:04 UTC 2019 - ddiss@suse.com Wed Feb 6 14:21:04 UTC 2019 - ddiss@suse.com

48
pcp.spec
View File

@ -73,7 +73,7 @@ Summary: System-level performance monitoring and performance management
License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by} License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by}
Group: %{pcp_gr} Group: %{pcp_gr}
Name: pcp Name: pcp
Version: 4.3.0 Version: 4.3.1
Release: 0 Release: 0
%global buildversion 1 %global buildversion 1
@ -90,19 +90,9 @@ Patch2: 0002-Remove-CPAN-rpaths.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de # PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch3: 0003-Remove-runlevel-4-from-init-scripts.patch Patch3: 0003-Remove-runlevel-4-from-init-scripts.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de # PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch4: 0004-create-pmlogger-and-pmie-logdirs-during-install.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch5: 0005-SUSE-fy-pmsnap-control-path.patch Patch5: 0005-SUSE-fy-pmsnap-control-path.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de # PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch6: 0006-pmsnap-control-var-www-srv-www.patch Patch6: 0006-pmsnap-control-var-www-srv-www.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch7: 0007-pmie-add-systemd-timers-as-cron-alternative.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch8: 0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch9: 0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch10: 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%global disable_selinux 0 %global disable_selinux 0
@ -147,7 +137,10 @@ Patch10: 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch
%global disable_python3 1 %global disable_python3 1
%endif %endif
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 || 0%{?sle_version} > 150000 # drop python2 packages on Tumbleweed and SLE15
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 || 0%{?suse_version} >= 1500
%global _with_python2 --with-python=no
%global disable_python2 1
%global __python2 python2 %global __python2 python2
%else %else
%global __python2 python %global __python2 python
@ -330,16 +323,15 @@ Requires: which
Requires: cpp Requires: cpp
Requires: cyrus-sasl Requires: cyrus-sasl
Requires: sysconfig Requires: sysconfig
%if !%{disable_python2}
# pmatop needs curses.py # pmatop needs curses.py
Requires: %{__python2}-curses Requires: %{__python2}-curses
%endif
%else %else
Requires: initscripts Requires: initscripts
%endif %endif
Requires: %{__python2}-pcp = %{version}-%{release}
Requires: %{lib_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release}
Requires: perl-PCP-PMDA = %{version}-%{release}
Requires: python
Obsoletes: pcp-pmda-nvidia < %{version} Obsoletes: pcp-pmda-nvidia < %{version}
%global tapsetdir %{_datadir}/systemtap/tapset %global tapsetdir %{_datadir}/systemtap/tapset
@ -1977,6 +1969,7 @@ collecting metrics about web server logs.
# end pcp-pmda-weblog # end pcp-pmda-weblog
# end C pmdas # end C pmdas
%if !%{disable_python2}
# #
# python-pcp. This is the PCP library bindings for python. # python-pcp. This is the PCP library bindings for python.
# #
@ -2001,6 +1994,7 @@ Obsoletes: python-pcp
This python PCP module contains the language bindings for This python PCP module contains the language bindings for
Performance Metric API (PMAPI) monitor tools and Performance Performance Metric API (PMAPI) monitor tools and Performance
Metric Domain Agent (PMDA) collector tools written in Python. Metric Domain Agent (PMDA) collector tools written in Python.
%endif # !%{disable_python2}
%if !%{disable_python3} %if !%{disable_python3}
# #
@ -2122,13 +2116,8 @@ updated policy package.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
autoconf autoconf
@ -2152,7 +2141,8 @@ PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXX
%{?_with_perfevent} \ %{?_with_perfevent} \
%{?_with_json} \ %{?_with_json} \
%{?_with_snmp} \ %{?_with_snmp} \
%{?_with_nutcracker} %{?_with_nutcracker} \
%{?_with_python2}
PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" make default_pcp PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" make default_pcp
############################################################################### ###############################################################################
@ -2652,7 +2642,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%{fillup_only -n pmcd} %{fillup_only -n pmcd}
%{fillup_only -n pmlogger} %{fillup_only -n pmlogger}
%{fillup_only -n pmproxy} %{fillup_only -n pmproxy}
%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_daily_check.timer pmlogger_daily_poll.timer pmlogger_daily_report.timer pmlogger_daily_report_poll.timer %service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer pmlogger_daily_report.timer pmlogger_daily_report-poll.timer
%else %else
%{fillup_and_insserv pmcd} %{fillup_and_insserv pmcd}
%{fillup_and_insserv pmlogger} %{fillup_and_insserv pmlogger}
@ -2732,7 +2722,7 @@ fi
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%if !%{disable_systemd} %if !%{disable_systemd}
%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_daily_check.timer pmlogger_daily_poll.timer pmlogger_daily_report.timer pmlogger_daily_report_poll.timer %service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer pmlogger_daily_report.timer pmlogger_daily_report-poll.timer
%else %else
%{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} %{?restart_on_update:%{restart_on_update pcp pmproxy pmie}}
%{?insserv_cleanup:%{insserv_cleanup}} %{?insserv_cleanup:%{insserv_cleanup}}
@ -2825,14 +2815,14 @@ fi
%{_unitdir}/pmie_daily.timer %{_unitdir}/pmie_daily.timer
%{_unitdir}/pmlogger_daily.service %{_unitdir}/pmlogger_daily.service
%{_unitdir}/pmlogger_daily.timer %{_unitdir}/pmlogger_daily.timer
%{_unitdir}/pmlogger_daily_check.service %{_unitdir}/pmlogger_check.service
%{_unitdir}/pmlogger_daily_check.timer %{_unitdir}/pmlogger_check.timer
%{_unitdir}/pmlogger_daily_poll.service %{_unitdir}/pmlogger_daily-poll.service
%{_unitdir}/pmlogger_daily_poll.timer %{_unitdir}/pmlogger_daily-poll.timer
%{_unitdir}/pmlogger_daily_report.service %{_unitdir}/pmlogger_daily_report.service
%{_unitdir}/pmlogger_daily_report.timer %{_unitdir}/pmlogger_daily_report.timer
%{_unitdir}/pmlogger_daily_report_poll.service %{_unitdir}/pmlogger_daily_report-poll.service
%{_unitdir}/pmlogger_daily_report_poll.timer %{_unitdir}/pmlogger_daily_report-poll.timer
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%{_fillupdir}/sysconfig.pmlogger %{_fillupdir}/sysconfig.pmlogger