reporting/reports reporting/reports.py reporting/spacewalk-report
by Tomáš Kašpárek
reporting/reports.py | 11 +++++++++++
reporting/reports/data/inactive-systems | 7 +++++--
reporting/spacewalk-report | 7 +------
3 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit d05f7724d1a06ddabc7568338526d6105d3fcb96
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 17 10:34:59 2013 +0100
parametrization of spacewalk-report with spacewalk config
added new section params: to spacewalk-reports
in this section there's list of sql bind variables excepted with their source
example
params:
tresh web.system_checkin_threshold
and in sql:
.* numtodsinterval(:tresh * 86400, 'second') .*
diff --git a/reporting/reports.py b/reporting/reports.py
index 3a97706..3cf46bf 100644
--- a/reporting/reports.py
+++ b/reporting/reports.py
@@ -3,6 +3,8 @@ import os
import re
import sys
+from spacewalk.common.rhnConfig import RHNOptions
+
REPORT_DEFINITIONS = "/usr/share/spacewalk/reports/data"
def available_reports():
@@ -21,6 +23,7 @@ class report:
self.multival_column_names = {}
self.multival_columns_reverted = {}
self.multival_columns_stop = []
+ self.params = {}
self._load(full_path)
def _load(self, full_path):
@@ -96,6 +99,14 @@ class report:
if description != None:
self.column_descriptions[c] = description
i = i + 1
+ elif tag == 'params':
+ lines = filter(lambda x: x != '', re.split('\s*\n\s*', value))
+ for l in lines:
+ ( p, v ) = re.split('\s+', l, 1)
+ ( component, option ) = re.split('\.', v, 1)
+ cfg = RHNOptions(component)
+ cfg.parse()
+ self.params[p] = str(cfg.get(option))
elif tag == 'multival_columns':
# the multival_columns specifies either
# a "stop" column, usually the first one,
diff --git a/reporting/reports/data/inactive-systems b/reporting/reports/data/inactive-systems
index 525e53a..0e73a79 100644
--- a/reporting/reports/data/inactive-systems
+++ b/reporting/reports/data/inactive-systems
@@ -14,6 +14,10 @@ columns:
organization_id Id of organization system belongs to
last_checkin Last check of the system
+params:
+
+ tresh web.system_checkin_threshold
+
sql:
select * from (
@@ -24,8 +28,7 @@ sql:
from rhnServer
join rhnServerInfo on rhnServer.id=rhnServerInfo.server_id
where rhnServerInfo.checkin < current_timestamp - numtodsinterval(
- -- checkin_threshold_placeholder
- * 86400, 'second')
+ :tresh * 86400, 'second')
) X
-- where placeholder
order by system_id, organization_id
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index af0676c..bd6dfda 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -180,16 +180,11 @@ if __name__ == '__main__':
the_sql = report.sql
- if report_name == "inactive-systems":
- cfg = RHNOptions('web')
- cfg.parse()
- the_dict_where['tresh'] = str(cfg.get('system_checkin_threshold'))
- the_sql = the_sql.replace('-- checkin_threshold_placeholder', ':tresh')
if the_sql_where:
the_sql = the_sql.replace('-- where placeholder', 'where %s' % ' and '.join(the_sql_where))
h = rhnSQL.prepare(the_sql)
- h.execute(**the_dict_where)
+ h.execute(**dict(report.params.items() + the_dict_where.items()))
db_columns = map(lambda x: x[0].lower(), h.description)
if db_columns != report.columns:
11 years, 4 months
Changes to 'refs/tags/spacewalk-abrt-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-abrt-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 09:32 +0000
Tagging package [spacewalk-abrt] version [1.9.1-1] in directory [client/rhel/spacewalk-abrt/].
Changes since spacewalk-backend-1.9.16-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-abrt] release [1.9.1-1].
---
client/rhel/spacewalk-abrt/spacewalk-abrt.spec | 5 ++++-
rel-eng/packages/spacewalk-abrt | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/spacewalk-abrt/spacewalk-abrt.spec | 5 ++++-
rel-eng/packages/spacewalk-abrt | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b0e68d53412ea899dd0a582aad7c1b4e7bf55e80
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 10:32:56 2013 +0100
Automatic commit of package [spacewalk-abrt] release [1.9.1-1].
diff --git a/client/rhel/spacewalk-abrt/spacewalk-abrt.spec b/client/rhel/spacewalk-abrt/spacewalk-abrt.spec
index 22a16e4..c5508b7 100644
--- a/client/rhel/spacewalk-abrt/spacewalk-abrt.spec
+++ b/client/rhel/spacewalk-abrt/spacewalk-abrt.spec
@@ -1,5 +1,5 @@
Name: spacewalk-abrt
-Version: 0.0.1
+Version: 1.9.1
Release: 1%{?dist}
Summary: ABRT plug-in for rhn-check
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/abrt.*
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.1-1
+- abrt: use DumpLocation from /etc/abrt/abrt.conf if set
+
* Wed Jul 18 2012 Jan Pazdziora 0.0.1-1
- new package built with tito
diff --git a/rel-eng/packages/spacewalk-abrt b/rel-eng/packages/spacewalk-abrt
index d058481..da66a0c 100644
--- a/rel-eng/packages/spacewalk-abrt
+++ b/rel-eng/packages/spacewalk-abrt
@@ -1 +1 @@
-0.0.1-1 client/rhel/spacewalk-abrt/
+1.9.1-1 client/rhel/spacewalk-abrt/
11 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.9.16-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 09:31 +0000
Tagging package [spacewalk-backend] version [1.9.16-1] in directory [backend/].
Changes since spacewalk-schema-1.9.11-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.9.16-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit dc8c28e9460c2ef489e7578a69510da85ce82c9e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 10:31:08 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index aa30e15..f2d9664 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.15
+Version: 1.9.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.16-1
+- abrt: use insert + update rather than delete + insert
+- fix bogus dates in changelog
+
* Wed Jan 02 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.15-1
- 889263 - unify java & backend grace period lenghts
- 890910 - set satsync email sender to root@<satfqdn>
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 654c8d8..5a43e1b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.15-1 backend/
+1.9.16-1 backend/
11 years, 4 months
Changes to 'refs/tags/spacewalk-schema-1.9.11-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 09:30 +0000
Tagging package [spacewalk-schema] version [1.9.11-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.9.42-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.9.11-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 49c38fbb6d31c8803c6328692fa23fe389843b13
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 10:30:36 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.9.11-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 4daac04..547a0fa 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.10-1 schema/spacewalk/
+1.9.11-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index da4d052..59311b0 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.9.10
+Version: 1.9.11
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.11-1
+- 894356 - more informative spacewalk-schema-upgrade
+
* Wed Jan 02 2013 Jan Pazdziora 1.9.10-1
- 889463 - correct olson name for Australia Western timezone
11 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.9.42-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.42-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 09:30 +0000
Tagging package [spacewalk-java] version [1.9.42-1] in directory [java/].
Changes since spacewalk-utils-1.9.10-1:
Jan Pazdziora (4):
The isUserManaged does not seem to be used anywhere, removing.
Copy RHN-ORG-TRUSTED-SSL-CERT if it exists, not a random SSL key.
For RHN-ORG-TRUSTED-SSL-CERT, inform that it will be copied over to new orgs.
Automatic commit of package [spacewalk-java] release [1.9.42-1].
Milan Zazrivec (4):
abrt: correct webui message
display abrt summary only if spacewalk-abrt is installed
abrt: use insert + update rather than delete + insert
abrt: use DumpLocation from /etc/abrt/abrt.conf if set
Tomas Kasparek (4):
745342 - additional column in spacewalk-report inventory
662773 - spacewalk-report system-packages-installed
703629 - spacewalk-report inactive-systems RFE
security fix + fixing typo
---
backend/server/handlers/xmlrpc/abrt.py | 20 ++--
client/rhel/spacewalk-abrt/abrt.py | 4
java/code/src/com/redhat/rhn/domain/server/EntitlementServerGroup.java | 10 --
java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java | 8 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 8 +
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 12 --
java/code/webapp/WEB-INF/pages/keys/keys.jsp | 6 +
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 42 +++++-----
java/spacewalk-java.spec | 9 +-
rel-eng/packages/spacewalk-java | 2
reporting/reports/data/inactive-systems | 32 +++++++
reporting/reports/data/inventory | 7 +
reporting/reports/data/system-packages-installed | 38 +++++++++
reporting/spacewalk-report | 7 +
14 files changed, 142 insertions(+), 63 deletions(-)
---
11 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit ff806443b5f32ae7053a0b258e358ca6dd5005b2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 10:30:05 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.42-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8768341..80a7fb4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.41
+Version: 1.9.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.42-1
+- For RHN-ORG-TRUSTED-SSL-CERT, inform that it will be copied over to new orgs.
+- Copy RHN-ORG-TRUSTED-SSL-CERT if it exists, not a random SSL key.
+- display abrt summary only if spacewalk-abrt is installed
+- abrt: correct webui message
+- The isUserManaged does not seem to be used anywhere, removing.
+
* Mon Jan 14 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.41-1
- 863123 - the query works much better when it uses existing columns
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9aa737d..793ffcc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.41-1 java/
+1.9.42-1 java/
11 years, 4 months
reporting/reports reporting/spacewalk-report
by Tomáš Kašpárek
reporting/reports/data/inactive-systems | 2 +-
reporting/spacewalk-report | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7df3476c522a87b3eeea1fa9a3ba4bafdc96eced
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 17 09:29:45 2013 +0100
security fix + fixing typo
system_checkin_treshold as parameter
diff --git a/reporting/reports/data/inactive-systems b/reporting/reports/data/inactive-systems
index 2ed5d1c..525e53a 100644
--- a/reporting/reports/data/inactive-systems
+++ b/reporting/reports/data/inactive-systems
@@ -27,6 +27,6 @@ sql:
-- checkin_threshold_placeholder
* 86400, 'second')
) X
- -- where placeholer
+ -- where placeholder
order by system_id, organization_id
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 636413a..af0676c 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -183,7 +183,8 @@ if __name__ == '__main__':
if report_name == "inactive-systems":
cfg = RHNOptions('web')
cfg.parse()
- the_sql = the_sql.replace('-- checkin_threshold_placeholder', str(cfg.get('system_checkin_threshold')))
+ the_dict_where['tresh'] = str(cfg.get('system_checkin_threshold'))
+ the_sql = the_sql.replace('-- checkin_threshold_placeholder', ':tresh')
if the_sql_where:
the_sql = the_sql.replace('-- where placeholder', 'where %s' % ' and '.join(the_sql_where))
11 years, 4 months