Update of /cvsroot/perfparse/_perfparse/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/scripts
Modified Files:
mysql_create.sql perfparsed.sh
Log Message:
some cosmetic changes and a little work on the php interface
Index: mysql_create.sql
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mysql_create.sql 3 Sep 2007 22:56:25 -0000 1.26
--- mysql_create.sql 28 Sep 2007 21:53:16 -0000 1.27
***************
*** 45,48 ****
--- 45,52 ----
insert into perfdata_delete_policy (policy_id,policy_name,delete_policy_seconds,policy_comment,instance_id) values
(0,'__Default_Bin',-1,'Internal default bin policy.',0);
+
+ # mysql seems to ignore setting the autoindexes column
+ update perfdata_delete_policy set policy_id=0 where policy_name='__Default_Bin';
+
insert into perfdata_delete_policy (policy_id,policy_name,delete_policy_seconds,policy_comment,instance_id) values
(1,'__Default_Raw',-1,'Internal default raw policy.',0);
***************
*** 61,67 ****
raw_delete_policy_individual INTEGER,
bin_delete_policy_id INTEGER,
! bin__delete_policy_individual INTEGER
FOREIGN KEY perfdata_groups_ibfk_2 (bin_delete_policy_id)
! REFERENCES perfdata_delete_policy (policy_id)
ON DELETE SET NULL,
FOREIGN KEY perfdata_groups_ibfk_3 (raw_delete_policy_id)
--- 65,71 ----
raw_delete_policy_individual INTEGER,
bin_delete_policy_id INTEGER,
! bin_delete_policy_individual INTEGER,
FOREIGN KEY perfdata_groups_ibfk_2 (bin_delete_policy_id)
! REFERENCES perfdata_delete_policy(policy_id)
ON DELETE SET NULL,
FOREIGN KEY perfdata_groups_ibfk_3 (raw_delete_policy_id)
Index: perfparsed.sh
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/scripts/perfparsed.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** perfparsed.sh 22 Dec 2006 20:07:47 -0000 1.2
--- perfparsed.sh 28 Sep 2007 21:53:16 -0000 1.3
***************
*** 15,19 ****
! PPPIPE=/usr/local/nagios/var/serviceperf.log
NAGIOS_USER=nagios
NAGIOS_GROUP=nagios
--- 15,19 ----
! PPPIPE=/usr/local/nagios/var/perfdata-service.log
NAGIOS_USER=nagios
NAGIOS_GROUP=nagios
***************
*** 29,32 ****
--- 29,37 ----
APPLY_OLD_DATA=1
fi
+ if [ -n $PPPIPE ] ; then
+ echo "creating pipe"
+ mkfifo $PPPIPE
+ chown ${NAGIOS_USER}:${NAGIOS_GROUP} $PPPIPE
+ fi
echo "Starting perfparsed"
su $NAGIOS_USER -c "$PERFPARSED -d"
|
