Changes to 'refs/tags/status_log_acceptor-0.12.9-1'
by Jan Pazdziora
Tag 'status_log_acceptor-0.12.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-01 14:29 +0000
Tagging package [status_log_acceptor] version [0.12.9-1] in directory [monitoring/status_log_acceptor/].
Changes since SatConfig-general-1.216.26-1:
Jan Pazdziora (3):
Use RHN::DBI instead of plain DBI with sc_db login parameters.
Fixing inserts and updates for RHN_PROBE_STATE and RHN_SATELLITE_STATE.
Automatic commit of package [status_log_acceptor] release [0.12.9-1].
Tomas Lestach (1):
do not store DB information into the rhn_config_macro
---
java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 12 -------
monitoring/status_log_acceptor/AcceptStatusLog.pm | 17 ++++------
monitoring/status_log_acceptor/status_log_acceptor.spec | 6 ++-
rel-eng/packages/status_log_acceptor | 2 -
4 files changed, 13 insertions(+), 24 deletions(-)
---
12 years, 3 months
monitoring/status_log_acceptor rel-eng/packages
by Jan Pazdziora
monitoring/status_log_acceptor/status_log_acceptor.spec | 6 +++++-
rel-eng/packages/status_log_acceptor | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 836079cdf1713ab5a91d4995040e3fdc970ad952
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 15:29:14 2012 +0100
Automatic commit of package [status_log_acceptor] release [0.12.9-1].
diff --git a/monitoring/status_log_acceptor/status_log_acceptor.spec b/monitoring/status_log_acceptor/status_log_acceptor.spec
index d27c729..c13880a 100644
--- a/monitoring/status_log_acceptor/status_log_acceptor.spec
+++ b/monitoring/status_log_acceptor/status_log_acceptor.spec
@@ -1,6 +1,6 @@
Name: status_log_acceptor
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.12.8
+Version: 0.12.9
Release: 1%{?dist}
Summary: Current state log acceptor
URL: https://fedorahosted.org/spacewalk
@@ -38,6 +38,10 @@ install -m 444 AcceptStatusLog.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 01 2012 Jan Pazdziora 0.12.9-1
+- Fixing inserts and updates for RHN_PROBE_STATE and RHN_SATELLITE_STATE.
+- Use RHN::DBI instead of plain DBI with sc_db login parameters.
+
* Fri Apr 17 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.12.8-1
- Use Apache2::RequestRec. (jpazdziora(a)redhat.com)
- Returning undef instead of string "NULL". (jpazdziora(a)redhat.com)
diff --git a/rel-eng/packages/status_log_acceptor b/rel-eng/packages/status_log_acceptor
index 2857c1b..e97d006 100644
--- a/rel-eng/packages/status_log_acceptor
+++ b/rel-eng/packages/status_log_acceptor
@@ -1 +1 @@
-0.12.8-1 monitoring/status_log_acceptor/
+0.12.9-1 monitoring/status_log_acceptor/
12 years, 3 months
2 commits - monitoring/status_log_acceptor
by Jan Pazdziora
monitoring/status_log_acceptor/AcceptStatusLog.pm | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 8043c46bba5867a9558d8ea21a4c9f4eb0174223
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 15:25:43 2012 +0100
Fixing inserts and updates for RHN_PROBE_STATE and RHN_SATELLITE_STATE.
Addressing
ERROR: relation "probe_state" does not exist
LINE 2: UPDATE PROBE_STATE
^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 64.
ERROR: relation "satellite_state" does not exist
LINE 1: UPDATE SATELLITE_STATE SET LAST_CHECK = SYSDATE,
^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 122.
ERROR: column "sysdate" does not exist
LINE 1: UPDATE RHN_SATELLITE_STATE SET LAST_CHECK = SYSDATE,
^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 122.\n\n
diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index d7e3073..bc17fec 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -22,7 +22,7 @@ sub store_probe_state
# print "storing probe state...\n";
my $update_probe = $cs_dbh->prepare(q{
- UPDATE PROBE_STATE
+ UPDATE RHN_PROBE_STATE
SET LAST_CHECK = TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'),
STATE = ?,
OUTPUT = ?
@@ -31,7 +31,7 @@ sub store_probe_state
});
my $insert_probe = $cs_dbh->prepare(q{
- INSERT INTO PROBE_STATE
+ INSERT INTO RHN_PROBE_STATE
(LAST_CHECK, STATE, OUTPUT, SCOUT_ID, PROBE_ID)
VALUES
(TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'), ?, ?, ?, ?)
@@ -96,11 +96,11 @@ sub store_program
min_latency avg_latency );
my $update_sql =
- "UPDATE SATELLITE_STATE SET LAST_CHECK = SYSDATE";
+ "UPDATE RHN_SATELLITE_STATE SET LAST_CHECK = CURRENT_TIMESTAMP";
my $insert_sql = sprintf(
- "INSERT INTO SATELLITE_STATE (SATELLITE_ID, LAST_CHECK, %s) " .
- "VALUES (?, SYSDATE", join(",\n", @params));
+ "INSERT INTO RHN_SATELLITE_STATE (SATELLITE_ID, LAST_CHECK, %s) " .
+ "VALUES (?, CURRENT_TIMESTAMP", join(",\n", @params));
my @bindvars;
commit 82e510254d5ab8a95e8427083f3b7ca4afc075f9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 15:24:28 2012 +0100
Use RHN::DBI instead of plain DBI with sc_db login parameters.
Addressing
Error while processing status log: Can't connect to current state database: at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 216.
diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index 7ee1a0a..d7e3073 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -3,7 +3,7 @@ package NOCpulse::AcceptStatusLog;
use strict;
-use DBI;
+use RHN::DBI;
use CGI;
use NOCpulse::Config;
use LWP::UserAgent;
@@ -206,10 +206,7 @@ sub handler
{
# print "connecting to current state database...\n";
- $cs_dbh = DBI->connect("DBI:$cs_dbd:$cs_dbname",
- $cs_dbuname,
- $cs_dbpass,
- { RaiseError => 1, AutoCommit => 0 });
+ $cs_dbh = RHN::DBI->connect();
};
if( not defined $cs_dbh )
{
12 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 12 ----------
1 file changed, 12 deletions(-)
New commits:
commit 43ae2156021757e71ce53cad8a928201a95c4948
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 1 12:10:48 2012 +0100
do not store DB information into the rhn_config_macro
PG monitoring stuff
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
index ddc4b23..6a6c40f 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
@@ -287,18 +287,6 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand
ConfigMacro cmdom = MonitoringConfigFactory.
lookupConfigMacroByName("MDOM");
setConfigMacroDefault(cmdom, ConfigDefaults.get().getHostname());
- ConfigMacro dbname = MonitoringConfigFactory.
- lookupConfigMacroByName("RHN_DB_NAME");
- setConfigMacroDefault(dbname, MonitoringConfigFactory.getDatabaseName());
- ConfigMacro dbuname = MonitoringConfigFactory.
- lookupConfigMacroByName("RHN_DB_USERNAME");
- setConfigMacroDefault(dbuname, MonitoringConfigFactory.getDatabaseUsername());
- ConfigMacro dbpass = MonitoringConfigFactory.
- lookupConfigMacroByName("RHN_DB_PASSWD");
- setConfigMacroDefault(dbpass, MonitoringConfigFactory.getDatabasePassword());
- ConfigMacro dbowner = MonitoringConfigFactory.
- lookupConfigMacroByName("RHN_DB_TABLE_OWNER");
- setConfigMacroDefault(dbowner, MonitoringConfigFactory.getDatabaseUsername());
ConfigMacro sathostname = MonitoringConfigFactory.
lookupConfigMacroByName("RHN_SAT_HOSTNAME");
setConfigMacroDefault(sathostname, ConfigDefaults.get().getHostname());
12 years, 3 months
Changes to 'refs/tags/nocpulse-common-2.2.4-1'
by Jan Pazdziora
Tag 'nocpulse-common-2.2.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-01 12:33 +0000
Tagging package [nocpulse-common] version [2.2.4-1] in directory [monitoring/nocpulse-common/].
Changes since spacewalk-repo-1.7-3:
Jan Pazdziora (2):
Now we use RHN::DBI, the database handle is brand new, let's disconnect as well.
Automatic commit of package [nocpulse-common] release [2.2.4-1].
---
monitoring/SatConfig/general/InstallSoftwareConfig.pm | 1 +
monitoring/nocpulse-common/nocpulse-common.spec | 6 +++++-
monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 9 +++++++++
rel-eng/packages/nocpulse-common | 2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
---
12 years, 3 months
Changes to 'refs/tags/SatConfig-general-1.216.26-1'
by Jan Pazdziora
Tag 'SatConfig-general-1.216.26-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-01 12:33 +0000
Tagging package [SatConfig-general] version [1.216.26-1] in directory [monitoring/SatConfig/general/].
Changes since spacewalk-repo-1.7-3:
Jan Pazdziora (3):
Now we use RHN::DBI, the database handle is brand new, let's disconnect as well.
Automatic commit of package [nocpulse-common] release [2.2.4-1].
Automatic commit of package [SatConfig-general] release [1.216.26-1].
---
monitoring/SatConfig/general/InstallSoftwareConfig.pm | 1 +
monitoring/SatConfig/general/SatConfig-general.spec | 6 +++++-
monitoring/nocpulse-common/nocpulse-common.spec | 6 +++++-
monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 9 +++++++++
rel-eng/packages/SatConfig-general | 2 +-
rel-eng/packages/nocpulse-common | 2 +-
6 files changed, 22 insertions(+), 4 deletions(-)
---
12 years, 3 months
2 commits - monitoring/nocpulse-common monitoring/SatConfig rel-eng/packages
by Jan Pazdziora
monitoring/SatConfig/general/SatConfig-general.spec | 6 +++++-
monitoring/nocpulse-common/nocpulse-common.spec | 6 +++++-
rel-eng/packages/SatConfig-general | 2 +-
rel-eng/packages/nocpulse-common | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 21aee6f0e728a7dc9661de2cc21edfd4ddcd2767
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 13:33:23 2012 +0100
Automatic commit of package [SatConfig-general] release [1.216.26-1].
diff --git a/monitoring/SatConfig/general/SatConfig-general.spec b/monitoring/SatConfig/general/SatConfig-general.spec
index 95af63d..ab5bb2f 100644
--- a/monitoring/SatConfig/general/SatConfig-general.spec
+++ b/monitoring/SatConfig/general/SatConfig-general.spec
@@ -2,7 +2,7 @@
%define hb_res_dir %{_sysconfdir}/ha.d/resource.d
%define installed_dir %sysv_dir/installed
Name: SatConfig-general
-Version: 1.216.25
+Version: 1.216.26
Release: 1%{?dist}
Summary: Satellite Configuration System - general setup, used by many packages
URL: https://fedorahosted.org/spacewalk
@@ -65,6 +65,10 @@ install -D -p -m 755 NOCpulse-ini $RPM_BUILD_ROOT%{_sbindir}/NOCpulse-ini
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 01 2012 Jan Pazdziora 1.216.26-1
+- Now we use RHN::DBI, the database handle is brand new, let's disconnect as
+ well.
+
* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.216.25-1
- fixed start order of Monitoring services
diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfig-general
index bf115cc..d7a6794 100644
--- a/rel-eng/packages/SatConfig-general
+++ b/rel-eng/packages/SatConfig-general
@@ -1 +1 @@
-1.216.25-1 monitoring/SatConfig/general/
+1.216.26-1 monitoring/SatConfig/general/
commit 12d44fb90fdc00281a75059f95904fa0bdf9b868
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 13:33:00 2012 +0100
Automatic commit of package [nocpulse-common] release [2.2.4-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 5fdaa3e..483fe43 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.2.3
+Version: 2.2.4
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -150,6 +150,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 01 2012 Jan Pazdziora 2.2.4-1
+- Now we use RHN::DBI, the database handle is brand new, let's disconnect as
+ well.
+
* Tue Jan 31 2012 Jan Pazdziora 2.2.3-1
- In monitoring, use RHN::DBI instead of RHN::DB because we do not want to
reuse the connection.
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index 4528d28..866fc2a 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.2.3-1 monitoring/nocpulse-common/
+2.2.4-1 monitoring/nocpulse-common/
12 years, 3 months
monitoring/nocpulse-common monitoring/SatConfig
by Jan Pazdziora
monitoring/SatConfig/general/InstallSoftwareConfig.pm | 1 +
monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm | 9 +++++++++
2 files changed, 10 insertions(+)
New commits:
commit 5614fe2012180be8e0b847d192ef1b5e19cd502c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 1 13:19:33 2012 +0100
Now we use RHN::DBI, the database handle is brand new, let's disconnect as well.
Addressing
Starting Monitoring ...
Issuing rollback() due to DESTROY without explicit disconnect() of DBD::Pg::db handle dbname=spaceschema at /etc/rc.d/np.d/SysVStep.pm line 287.
Starting InstallSoftwareConfig ... [ OK ]
diff --git a/monitoring/SatConfig/general/InstallSoftwareConfig.pm b/monitoring/SatConfig/general/InstallSoftwareConfig.pm
index b4c3a0b..0b77723 100644
--- a/monitoring/SatConfig/general/InstallSoftwareConfig.pm
+++ b/monitoring/SatConfig/general/InstallSoftwareConfig.pm
@@ -22,6 +22,7 @@ sub startActions
$ini->connect();
$ini->fetch_nocpulseini('INTERNAL');
$ini->save();
+ $ini->disconnect();
};
if ($@) {
$self->addError($@);
diff --git a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
index 32d384e..f85b82d 100644
--- a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
+++ b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
@@ -49,6 +49,15 @@ sub connect {
return $dbh;
}
+sub disconnect {
+ my $self = shift;
+ my $dbh = $self->dbh;
+ if (defined $dbh) {
+ $dbh->disconnect;
+ }
+ $self->dbh(undef);
+}
+
sub save {
my $self = shift;
my $filename = shift || $self->filename;
12 years, 3 months
Changes to 'refs/tags/spacewalk-repo-1.7-3'
by Miroslav Suchý
Tag 'spacewalk-repo-1.7-3' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-02-01 12:17 +0000
Tagging package [spacewalk-repo] version [1.7-3] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-repo-1.7-2:
Miroslav Suchý (2):
do not check gpg at nighlty - it is not signed
Automatic commit of package [spacewalk-repo] minor release [1.7-3].
---
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
12 years, 3 months
2 commits - rel-eng/packages spec-tree/spacewalk-repo
by Miroslav Suchý
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 476611a323153a7b54871ec5cd7f527afd8f20f8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 1 13:17:29 2012 +0100
Automatic commit of package [spacewalk-repo] minor release [1.7-3].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index fbd8f37..1a9cb46 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-1.7-2 spec-tree/spacewalk-repo/
+1.7-3 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 25577d1..4dafc3a 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/yum.repos.d/spacewalk-client.repo
%changelog
+* Wed Feb 01 2012 Miroslav Suchý 1.7-3
+- do not check gpg at nightly - it is not signed
+
* Wed Feb 01 2012 Miroslav Suchý 1.7-2
- add Source0
- point spacewalk-repo to nightly
commit 3cb20bbb0d858f938a6849c32a38c9ab9f58708c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 1 13:16:48 2012 +0100
do not check gpg at nighlty - it is not signed
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index be790fb..25577d1 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -40,7 +40,7 @@ name=Spacewalk
baseurl=http://spacewalk.redhat.com/yum/nightly/%{reposubdir}/\$basearch/
gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
enabled=1
-gpgcheck=1
+gpgcheck=0
REPO
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-client.repo <<REPO
@@ -50,7 +50,7 @@ name=Spacewalk Client Tools
baseurl=http://spacewalk.redhat.com/yum/nightly-client/%{reposubdir}/\$ba...
gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
enabled=1
-gpgcheck=1
+gpgcheck=0
REPO
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-source.repo <<REPO
12 years, 3 months