Merge pull request #255 from jpwhite4/templates

Update template paths to explicitly include the PCP version.

Author: jpwhite4

config/templates/hotproc/hotproc.conf renamed to config/templates/pcp-4.3.x/hotproc/hotproc.conf

@@ -27,6 +27,9 @@ $version=1.1
 $PMCD_CONNECT_TIMEOUT=150
 $PMCD_REQUEST_TIMEOUT=120
 
+# disable automatic compression of log files.
+$PCP_COMPRESSAFTER=never
+
 # === LOGGER CONTROL SPECIFICATIONS ===
 #
 #Host		P?  S?	directory				args
@@ -36,7 +39,8 @@ $PMCD_REQUEST_TIMEOUT=120
 # (LOCALHOSTNAME is expanded to local: in the first column,
 # and to `hostname` in the fourth (directory) column.)
 #
-LOCALHOSTNAME	y   n	"PCP_LOG_DIR/pmlogger/$(date +%Y)/$(date +%m)/LOCALHOSTNAME/$(date +%Y)-$(date +%m)-$(date +%d)"	-r -c /etc/pcp/pmlogger/pmlogger-supremm.config
+LOCALHOSTNAME	y   n	"PCP_LOG_DIR/pmlogger/$(date +%Y)/$(date +%m)/LOCALHOSTNAME/$(date +%Y)-$(date +%m)-$(date +%d)"	-r -T24h10m -c /etc/pcp/pmlogger/pmlogger-supremm.config
+
 
 # Note:	if multiple pmloggers for the same host (e.g. both primary and
 #	non-primary loggers are active), then they MUST use different

config/templates/pmlogger/control renamed to config/templates/pcp-4.3.x/pmlogger/control

@@ -293,9 +293,6 @@ log mandatory on %{standard_freq} {
     # gpfs
     gpfs.fsios
 
-    # slurm
-    slurm.node
-
     # Intel MIC cards
     mic
 

config/templates/pmlogger/pmlogger-supremm.config renamed to config/templates/pcp-4.3.x/pmlogger/pmlogger-supremm.config

@@ -42,8 +42,8 @@
     data_files=[
         (confpath,                         ['config/config.json']),
         ('share/supremm/templates/slurm',       ['config/templates/slurm/slurm-epilog',  'config/templates/slurm/slurm-prolog']),
-        ('share/supremm/templates/hotproc',       ['config/templates/hotproc/hotproc.conf']),
-        ('share/supremm/templates/pmlogger',    ['config/templates/pmlogger/control',    'config/templates/pmlogger/pmlogger-supremm.config'])
+        ('share/supremm/templates/pcp-4.3.x/hotproc',       ['config/templates/pcp-4.3.x/hotproc/hotproc.conf']),
+        ('share/supremm/templates/pcp-4.3.x/pmlogger',    ['config/templates/pcp-4.3.x/pmlogger/control',    'config/templates/pcp-4.3.x/pmlogger/pmlogger-supremm.config'])
     ],
     scripts=[
              'src/supremm/supremm_update'