Changes to 'refs/tags/spacewalk-monitoring-1.9.5-1'
by Michael Mraka
Tag 'spacewalk-monitoring-1.9.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-26 14:16 +0000
Tagging package [spacewalk-monitoring] version [1.9.5-1] in directory [monitoring/spacewalk-monitoring/].
Changes since spacewalk-backend-1.9.36-1:
Michael Mraka (2):
old Fedoras don't have systemd_* macros defined
Automatic commit of package [spacewalk-monitoring] release [1.9.5-1].
---
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 15 ++++++++++----
rel-eng/packages/spacewalk-monitoring | 2 -
2 files changed, 12 insertions(+), 5 deletions(-)
---
11 years, 1 month
2 commits - monitoring/spacewalk-monitoring rel-eng/packages
by Michael Mraka
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 15 ++++++++++----
rel-eng/packages/spacewalk-monitoring | 2 -
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit e2ea2bcb6e5fda51e607c0241aea2b7799ffc53e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 15:16:29 2013 +0100
Automatic commit of package [spacewalk-monitoring] release [1.9.5-1].
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index bb1dc31..05dbe03 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk monitoring
Name: spacewalk-monitoring
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
License: GPLv2
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Feb 26 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.5-1
+- old Fedoras don't have systemd_* macros defined
+
* Tue Feb 26 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.4-1
- corrected monitoring service type
- enable monitoring services in systemd by default
diff --git a/rel-eng/packages/spacewalk-monitoring b/rel-eng/packages/spacewalk-monitoring
index 47f07ec..bc78f29 100644
--- a/rel-eng/packages/spacewalk-monitoring
+++ b/rel-eng/packages/spacewalk-monitoring
@@ -1 +1 @@
-1.9.4-1 monitoring/spacewalk-monitoring/
+1.9.5-1 monitoring/spacewalk-monitoring/
commit feec900fbf4896c71285e7f39b13c9297ed1a375
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 26 15:13:16 2013 +0100
old Fedoras don't have systemd_* macros defined
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index b3665af..bb1dc31 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -49,7 +49,9 @@ Requires: tsdb
Requires: spacewalk-monitoring-selinux
%if 0%{?fedora}
-%systemd_requires
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -118,10 +120,12 @@ if [ $1 = 0 ] ; then
/sbin/chkconfig --del Monitoring
fi
if [ -f %{_unitdir}/MonitoringScout.service ] ; then
- %systemd_preun MonitoringScout.service
+ /usr/bin/systemctl --no-reload disable MonitoringScout.service > /dev/null 2>&1 || :
+ /usr/bin/systemctl stop MonitoringScout.service > /dev/null 2>&1 || :
fi
if [ -f %{_unitdir}/Monitoring.service ] ; then
- %systemd_preun Monitoring.service
+ /usr/bin/systemctl --no-reload disable Monitoring.service > /dev/null 2>&1 || :
+ /usr/bin/systemctl stop Monitoring.service > /dev/null 2>&1 || :
fi
fi
11 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.9.36-1'
by Tomáš Kašpárek
Tag 'spacewalk-backend-1.9.36-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-02-26 13:52 +0000
Tagging package [spacewalk-backend] version [1.9.36-1] in directory [backend/].
Changes since spacewalk-backend-1.9.35-1:
Tomas Kasparek (2):
spacewalk-backend.spec fix
Automatic commit of package [spacewalk-backend] release [1.9.36-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 1 month
backend/spacewalk-backend.spec rel-eng/packages
by Tomáš Kašpárek
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fd48fca32683fae2beab2c6aa53e46712e697665
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 14:52:39 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.36-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 07364a0..b294cc7 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.35
+Version: 1.9.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Feb 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.36-1
+- spacewalk-backend.spec fix
+
* Tue Feb 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.35-1
- 914902 - system currency report
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e3560e9..081fdad 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.35-1 backend/
+1.9.36-1 backend/
11 years, 1 month
backend/spacewalk-backend.spec
by Tomáš Kašpárek
backend/spacewalk-backend.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 077ba2be7ec63dc81215f081b33472feb1c14c6a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 14:51:26 2013 +0100
spacewalk-backend.spec fix
added file rhn_sc.conf
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0e3ecb1..07364a0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -530,6 +530,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_sc.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
11 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.9.35-1'
by Tomáš Kašpárek
Tag 'spacewalk-backend-1.9.35-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-02-26 13:15 +0000
Tagging package [spacewalk-backend] version [1.9.35-1] in directory [backend/].
Changes since spacewalk-reports-1.9.5-1:
Tomas Kasparek (1):
Automatic commit of package [spacewalk-backend] release [1.9.35-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 1 month
backend/spacewalk-backend.spec rel-eng/packages
by Tomáš Kašpárek
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e51e03e04d5642bfd4b058d5d2790474b620a3f4
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 14:15:03 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ab8c94a..0e3ecb1 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.34
+Version: 1.9.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Feb 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.35-1
+- 914902 - system currency report
+
* Tue Feb 26 2013 Jan Pazdziora 1.9.34-1
- abrt: delete crash: remove content from filer
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 154f670..e3560e9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.34-1 backend/
+1.9.35-1 backend/
11 years, 1 month
Changes to 'refs/tags/spacewalk-reports-1.9.5-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.9.5-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-02-26 13:13 +0000
Tagging package [spacewalk-reports] version [1.9.5-1] in directory [reporting/].
Changes since spacewalk-admin-1.9.9-1:
Milan Zazrivec (1):
abrt: api to get/set org-wide crash file size limit
Tomas Kasparek (2):
914902 - system currency report
Automatic commit of package [spacewalk-reports] release [1.9.5-1].
---
backend/rhn-conf/rhn_sc.conf | 21 +++
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 1
java/code/src/com/redhat/rhn/domain/org/Org.java | 17 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java | 48 ++++++++
rel-eng/packages/spacewalk-reports | 2
reporting/reports/data/system-currency | 55 ++++++++++
reporting/spacewalk-reports.spec | 5
7 files changed, 147 insertions(+), 2 deletions(-)
---
11 years, 1 month
rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bbf727da63cf358689bbc3b080bc20e86279f1e9
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 14:13:30 2013 +0100
Automatic commit of package [spacewalk-reports] release [1.9.5-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 9c8ac31..aa6f86e 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.9.4-1 reporting/
+1.9.5-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index c9be842..848de21 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Feb 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.5-1
+- 914902 - system currency report
+
* Fri Feb 15 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.9.4-1
- Updating copyright info for 2013
11 years, 1 month
backend/rhn-conf reporting/reports
by Tomáš Kašpárek
backend/rhn-conf/rhn_sc.conf | 21 ++++++++++++
reporting/reports/data/system-currency | 55 +++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
New commits:
commit 232e4087234d8111fdefbbeb1b97f9f8858fa78e
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 14:07:48 2013 +0100
914902 - system currency report
new report for system currency
added rhn_sc.conf as system currency multipliers had no default config
diff --git a/backend/rhn-conf/rhn_sc.conf b/backend/rhn-conf/rhn_sc.conf
new file mode 100644
index 0000000..d689e70
--- /dev/null
+++ b/backend/rhn-conf/rhn_sc.conf
@@ -0,0 +1,21 @@
+# default values for system currency multipliers
+# needed by spacewalk-report for system currency report
+# these values are also hardcoded in java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+
+# multiplier for critical security errata
+sc.crit = 32
+
+# multiplier for important security errata
+sc.imp = 16
+
+# multiplier for moderate important security errata
+sc.mod = 8
+
+# multiplier for low important security errata
+sc.low = 4
+
+# multiplier for bugfix errra
+sc.bug = 2
+
+# multiplier for ehnancement errata
+sc.enh = 1
diff --git a/reporting/reports/data/system-currency b/reporting/reports/data/system-currency
new file mode 100644
index 0000000..4a1a4f9
--- /dev/null
+++ b/reporting/reports/data/system-currency
@@ -0,0 +1,55 @@
+
+synopsis:
+
+ System currency list
+
+description:
+
+ Prints list of number of available erratas for each registered system
+
+columns:
+
+ system_id Server ID
+ org_id Organization ID which is server registered to
+ name Name of the server
+ critical Number of critical security updates available
+ important Number of important security updates available
+ moderate Number of moderate important security updates available
+ low Number of low important security updates available
+ bug Number of bug fixes available
+ enhancement Number of enhancements available
+ score Total system score
+
+params:
+
+ p_crit sc.crit
+ p_imp sc.imp
+ p_mod sc.mod
+ p_low sc.low
+ p_bug sc.bug
+ p_enh sc.enh
+
+sql:
+
+ select * from (
+ select system_id, org_id, name, critical, important, moderate, low, bug, enhancement,
+ ((critical * :p_crit) + (important * :p_imp) + (moderate * :p_mod) + (low * :p_low) + (bug * :p_bug) + (enhancement * :p_enh)) as score
+ from (
+ select S.id as system_id,
+ S.org_id as org_id,
+ S.name as name,
+ sum(case when (substr(E.synopsis, 1, 1) = 'C' and E.advisory_type = 'Security Advisory') then 1 else 0 end) as critical,
+ sum(case when (substr(E.synopsis, 1, 1) = 'I' and E.advisory_type = 'Security Advisory') then 1 else 0 end) as important,
+ sum(case when (substr(E.synopsis, 1, 1) = 'M' and E.advisory_type = 'Security Advisory') then 1 else 0 end) as moderate,
+ sum(case when (substr(E.synopsis, 1, 1) = 'L' and E.advisory_type = 'Security Advisory') then 1 else 0 end) as low,
+ sum(case when E.advisory_type = 'Bug Fix Advisory' then 1 else 0 end) as bug,
+ sum(case when E.advisory_type = 'Product Enhancement Advisory' then 1 else 0 end) as enhancement
+ from rhnServer S left join
+ (select distinct err.id, snc.server_id, err.synopsis, err.advisory_type from rhnErrata err join
+ rhnServerNeededCache SNC on err.id=SNC.errata_id) E on S.id=E.server_id
+ group by S.id, S.org_id, name
+ )
+ ) X
+ -- where placeholder
+ order by org_id, system_id
+
11 years, 1 month