java/conf search-server/spacewalk-search
by StephenHerr
java/conf/default/rhn_taskomatic_daemon.conf | 3 +++
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 3 +++
2 files changed, 6 insertions(+)
New commits:
commit 7853915c3960caa81366ea2e43b79212cfafe362
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 25 15:16:28 2012 -0400
816299 - Updating default config files with additional options for heapdump directory
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf
index f26c0f6..875cd29 100644
--- a/java/conf/default/rhn_taskomatic_daemon.conf
+++ b/java/conf/default/rhn_taskomatic_daemon.conf
@@ -84,6 +84,9 @@ wrapper.java.classpath.60=/usr/share/java/mchange-commons.jar
# Java Additional Parameters
wrapper.java.additional.1=-Dibm.dst.compatibility=true
+### NOTE: Only uncomment these next two lines if you are running IBM Java ###
+#wrapper.java.additional.2=-Xdump:heap:file=/var/crash/heapdump.%Y%m%d.%H%M%S.%pid.%seq.phd
+#wrapper.java.additional.3=-Xdump:java:file=/var/crash/javacore.%Y%m%d.%H%M%S.%pid.%seq.txt
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=256
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
index 966d884..75b56b3 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
@@ -53,6 +53,9 @@ wrapper.java.library.path.6=/usr/lib64/gcj/postgresql-jdbc
# Java Additional Parameters
#wrapper.java.additional.1=
+### NOTE: Only uncomment the next two lines if you are running IBM Java ###
+#wrapper.java.additional.1=-Xdump:heap:file=/var/crash/heapdump.%Y%m%d.%H%M%S.%pid.%seq.phd
+#wrapper.java.additional.2=-Xdump:java:file=/var/crash/javacore.%Y%m%d.%H%M%S.%pid.%seq.txt
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=32
12 years
5 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java | 90 ++++++++--
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 5
2 files changed, 81 insertions(+), 14 deletions(-)
New commits:
commit a8c6cdf1ca87ba023acf1d14fc25855803ba73a5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 25 16:38:01 2012 +0200
Ensure that given system has OpenSCAP capability.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
index 9b96e18..e76c120 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.action.scap.ScapAction;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.manager.action.ActionManager;
+import com.redhat.rhn.manager.MissingCapabilityException;
import com.redhat.rhn.manager.MissingEntitlementException;
/**
@@ -91,6 +92,10 @@ public class SystemScapHandler extends BaseHandler {
throw new com.redhat.rhn.frontend.xmlrpc.MissingEntitlementException(
e.getMessage());
}
+ catch (MissingCapabilityException e) {
+ throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityException(
+ e.getCapability(), e.getServer());
+ }
}
/**
@@ -131,7 +136,6 @@ public class SystemScapHandler extends BaseHandler {
* "The date to schedule the action")
* @xmlrpc.returntype int - ID of the scap action created.
*/
- // TODO: install all the needed stuff
public int scheduleXccdfScan(String sessionKey, Integer sid,
String xccdfPath, String oscapParams, Date date) {
List serverIds = new ArrayList();
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 7af9ab7..f13cf3a 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1817,6 +1817,9 @@ public class ActionManager extends BaseManager {
for (Long serverId : serverIds) {
Server server = SystemManager.lookupByIdAndUser(serverId, scheduler);
+ if (!SystemManager.clientCapable(serverId, "scap.xccdf_eval")) {
+ throw new MissingCapabilityException("OpenSCAP", server);
+ }
if (!SystemManager.hasEntitlement(serverId,
EntitlementManager.MANAGEMENT)) {
throw new MissingEntitlementException(
commit 0860206d1ae3e2d03745cfbcd5706a71bbeb51e0
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 25 16:36:57 2012 +0200
Ensure that given systems is available to user.
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index d0d1781..7af9ab7 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1815,6 +1815,8 @@ public class ActionManager extends BaseManager {
return null;
}
for (Long serverId : serverIds) {
+ Server server = SystemManager.lookupByIdAndUser(serverId, scheduler);
+
if (!SystemManager.hasEntitlement(serverId,
EntitlementManager.MANAGEMENT)) {
throw new MissingEntitlementException(
commit 118006f7927b52aae370059b9ea8fff4af81a3cf
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 25 15:37:10 2012 +0200
Repack and throw MissingEntitlementException when occurs.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
index 9819c15..9b96e18 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
@@ -14,17 +14,17 @@
*/
package com.redhat.rhn.frontend.xmlrpc.system.scap;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import com.redhat.rhn.domain.action.scap.ScapAction;
-import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.manager.action.ActionManager;
-import com.redhat.rhn.manager.system.SystemManager;
+import com.redhat.rhn.manager.MissingEntitlementException;
/**
* SystemScapHandler
@@ -82,9 +82,15 @@ public class SystemScapHandler extends BaseHandler {
longServerIds.add(new Long((Integer) it.next()));
}
- ScapAction action = ActionManager.scheduleXccdfEval(loggedInUser,
- longServerIds, xccdfPath, oscapParams, date);
- return action.getId().intValue();
+ try {
+ ScapAction action = ActionManager.scheduleXccdfEval(loggedInUser,
+ longServerIds, xccdfPath, oscapParams, date);
+ return action.getId().intValue();
+ }
+ catch (MissingEntitlementException e) {
+ throw new com.redhat.rhn.frontend.xmlrpc.MissingEntitlementException(
+ e.getMessage());
+ }
}
/**
@@ -128,11 +134,8 @@ public class SystemScapHandler extends BaseHandler {
// TODO: install all the needed stuff
public int scheduleXccdfScan(String sessionKey, Integer sid,
String xccdfPath, String oscapParams, Date date) {
- User loggedInUser = getLoggedInUser(sessionKey);
- Server server = SystemManager.lookupByIdAndUser(new Long(sid.longValue()),
- loggedInUser);
- ScapAction action = ActionManager.scheduleXccdfEval(loggedInUser, server,
- xccdfPath, oscapParams, date);
- return action.getId().intValue();
+ List serverIds = new ArrayList();
+ serverIds.add(sid);
+ return scheduleXccdfScan(sessionKey, serverIds, xccdfPath, oscapParams, date);
}
}
commit 44949f70fef5b2a47f48df0e09b4b548e840773a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 25 14:51:26 2012 +0200
Sort imports alphabetically.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
index 707d694..9819c15 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
@@ -14,18 +14,17 @@
*/
package com.redhat.rhn.frontend.xmlrpc.system.scap;
+import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.action.scap.ScapAction;
-import com.redhat.rhn.manager.system.SystemManager;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.manager.action.ActionManager;
-
-import java.util.Date;
+import com.redhat.rhn.manager.system.SystemManager;
/**
* SystemScapHandler
commit ab77fae73d6dfc2558e81035727fbfeb366a70fa
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 25 14:03:47 2012 +0200
API: SCAP scan schedule for multiple systems
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
index af1696e..707d694 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
@@ -14,6 +14,10 @@
*/
package com.redhat.rhn.frontend.xmlrpc.system.scap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.server.Server;
@@ -32,6 +36,59 @@ import java.util.Date;
public class SystemScapHandler extends BaseHandler {
/**
+ * Run OpenSCAP XCCDF Evaluation on a given list of servers
+ * @param sessionKey The session key.
+ * @param serverIds The list of server ids,
+ * @param xccdfPath The path to xccdf document.
+ * @param oscapParams The additional params for oscap tool.
+ * @return ID of new SCAP action.
+ *
+ * @xmlrpc.doc Schedule OpenSCAP scan.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #array_single("int", "serverId")
+ * @xmlrpc.param #param("string", "Path to xccdf content on targeted systems.")
+ * @xmlrpc.param #param("string", "Additional parameters for oscap tool.")
+ * @xmlrpc.returntype int - ID if SCAP action created.
+ */
+ public int scheduleXccdfScan(String sessionKey, List serverIds,
+ String xccdfPath, String oscapParams) {
+ return scheduleXccdfScan(sessionKey, serverIds, xccdfPath,
+ oscapParams, new Date());
+ }
+
+ /**
+ * Run OpenSCAP XCCDF Evaluation on a given list of servers
+ * @param sessionKey The session key.
+ * @param serverIds The list of server ids,
+ * @param xccdfPath The path to xccdf document.
+ * @param oscapParams The additional params for oscap tool.
+ * @param date The date of earliest occurence.
+ * @return ID of new SCAP action.
+ *
+ * @xmlrpc.doc Schedule OpenSCAP scan.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #array_single("int", "serverId")
+ * @xmlrpc.param #param("string", "Path to xccdf content on targeted systems.")
+ * @xmlrpc.param #param("string", "Additional parameters for oscap tool.")
+ * @xmlrpc.param #param_desc("dateTime.iso8601","date",
+ * "The date to schedule the action")
+ * @xmlrpc.returntype int - ID if SCAP action created.
+ */
+ public int scheduleXccdfScan(String sessionKey, List serverIds,
+ String xccdfPath, String oscapParams, Date date) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+
+ HashSet<Long> longServerIds = new HashSet<Long>();
+ for (Iterator it = serverIds.iterator(); it.hasNext();) {
+ longServerIds.add(new Long((Integer) it.next()));
+ }
+
+ ScapAction action = ActionManager.scheduleXccdfEval(loggedInUser,
+ longServerIds, xccdfPath, oscapParams, date);
+ return action.getId().intValue();
+ }
+
+ /**
* Run Open Scap XCCDF Evaluation on a given server
* @param sessionKey The session key.
* @param sid The server id.
@@ -69,7 +126,6 @@ public class SystemScapHandler extends BaseHandler {
* "The date to schedule the action")
* @xmlrpc.returntype int - ID of the scap action created.
*/
- // TODO: multiple server instances at once
// TODO: install all the needed stuff
public int scheduleXccdfScan(String sessionKey, Integer sid,
String xccdfPath, String oscapParams, Date date) {
12 years
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2cd7126f390816863688236836465d4327f3f439
Author: Uwe Gansert <ug(a)suse.de>
Date: Mon Jul 18 13:48:52 2011 +0200
changed kernel-params field to 1024 chars in size (bnc#698166)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
index be94c2b..7e2e5c8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
@@ -56,12 +56,12 @@
<tr>
<th><bean:message key="kickstartdetails.jsp.kernel_options"/></th>
- <td><html:text property="kernel_options" maxlength="64" size="32" /></td>
+ <td><html:text property="kernel_options" maxlength="1024" size="32" /></td>
</tr>
<tr>
<th><bean:message key="kickstartdetails.jsp.post_kernel_options"/></th>
- <td><html:text property="post_kernel_options" maxlength="64" size="32" /></td>
+ <td><html:text property="post_kernel_options" maxlength="1024" size="32" /></td>
</tr>
<tr>
12 years
4 commits - branding/img java/code
by Tomas Lestach
branding/img/restart.png |binary
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 1
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 16 +++++++---
4 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit f81c90023b36e51be8c6f8eb21c1eec1bc97f925
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 24 18:30:02 2012 +0200
removing unused lookup
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index 936eb71..d7dc027 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -48,7 +48,6 @@ public class ChannelPackageMenuAction extends RhnAction {
long cid = requestContext.getRequiredParam("cid");
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
- ChannelFactory.lookupByLabelAndUser(chan.getLabel(), user);
if (!user.hasRole(RoleFactory.CHANNEL_ADMIN) &&
!UserManager.verifyChannelAdmin(user, chan)) {
throw new PermissionCheckFailureException(RoleFactory.CHANNEL_ADMIN);
commit b3d46efc68355e59e879726591d20875f2cb2a4b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Apr 24 15:43:30 2012 +0200
Capitalize title to be consistent
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index e82b561..72e9d24 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -5062,7 +5062,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</trans-unit>
<trans-unit id="requiringrebootlist.jsp.header">
- <source>Systems requiring reboot</source>
+ <source>Systems Requiring Reboot</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/RequiringReboot</context>
<context context-type="sourcefile">/rhn/systems/YourRhn.do</context>
commit 76a369475e24a5bdcf3b35ab8395efd3c8a8f53a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Apr 20 13:39:16 2012 +0200
Missing icon for the systems that need reboot list
diff --git a/branding/img/restart.png b/branding/img/restart.png
new file mode 100644
index 0000000..3fd71d6
Binary files /dev/null and b/branding/img/restart.png differ
commit c15d5aecce23dfea32dd518c233f0d3bd8ae546c
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Apr 24 16:18:00 2012 +0200
Put the reboot notification at the end. Make it not mutually exclusive with other notifications.
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index d69645b..94eba0d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -8,8 +8,10 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><bean:message key="sdc.details.overview.systemstatus"/></h2>
+
<div class="systeminfo">
<div class="systeminfo-full">
+
<c:choose>
<c:when test="${unentitled}">
@@ -22,10 +24,6 @@
<bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/>
</c:if>
</c:when>
- <c:when test="${rebootRequired}">
- <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/>
- <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
- </c:when>
<c:when test="${hasUpdates}">
<c:choose>
<c:when test="${criticalErrataCount > 0}">
@@ -54,6 +52,16 @@
</c:otherwise>
</c:choose>
</div>
+
+ <c:if test="${rebootRequired}">
+ <div class="systeminfo">
+ <div class="systeminfo-full">
+ <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/>
+ <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
+ </div>
+ </div>
+ </c:if>
+
<div class="systeminfo-clear" />
</div>
<c:if test="${probeListEmpty != 'true'}">
12 years
Changes to 'refs/tags/rhn-client-tools-1.8.3-1'
by Milan Zazrivec
Tag 'rhn-client-tools-1.8.3-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2012-04-25 13:40 +0000
Tagging package [rhn-client-tools] version [1.8.3-1] in directory [client/rhel/rhn-client-tools/].
Changes since status_log_acceptor-0.12.11-1:
Milan Zazrivec (2):
816199 - include package dependency on newt
Automatic commit of package [rhn-client-tools] release [1.8.3-1].
Simon Lukasik (1):
API: SCAP scan schedule should accept the date of earliest occurence
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 11 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java | 29 ++++++++--
rel-eng/packages/rhn-client-tools | 2
3 files changed, 37 insertions(+), 5 deletions(-)
---
12 years
client/rhel rel-eng/packages
by Milan Zazrivec
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d4704165dab9b748e39f13515bfba7885335cfe0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Apr 25 15:40:07 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.3-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d78e8dd..fb86b10 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.8.2
+Version: 1.8.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Apr 25 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 1.8.3-1
+- 816199 - include package dependency on newt
+
* Tue Apr 03 2012 Jan Pazdziora 1.8.2-1
- 804559 - not all msgs are CommunicationError objects (mzazrivec(a)redhat.com)
- 804559 - correct string catenation (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ffbfca3..ff0a640 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.2-1 client/rhel/rhn-client-tools/
+1.8.3-1 client/rhel/rhn-client-tools/
12 years
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 6d5a4eaa502db93b83a5d79d1e3bf627c8cb5290
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Apr 25 15:39:07 2012 +0200
816199 - include package dependency on newt
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 224e34f..d78e8dd 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -91,6 +91,12 @@ Group: System Environment/Base
Requires: usermode >= 1.36
Requires: %{name} = %{version}-%{release}
Requires: rhnsd
+%if 0%{?rhel} == 5
+Requires: newt
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 5
+Requires: newt-python
+%endif
%description -n rhn-setup
rhn-setup contains programs and utilities to configure a system to use
12 years
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java | 29 ++++++++--
1 file changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 7add29d72279de2466c4b1fb79de76ddb3a08ea6
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Apr 24 17:25:47 2012 +0200
API: SCAP scan schedule should accept the date of earliest occurence
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
index e26dc34..af1696e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java
@@ -30,6 +30,7 @@ import java.util.Date;
* @xmlrpc.doc Provides methods to schedule SCAP scans and access the results.
*/
public class SystemScapHandler extends BaseHandler {
+
/**
* Run Open Scap XCCDF Evaluation on a given server
* @param sessionKey The session key.
@@ -45,16 +46,38 @@ public class SystemScapHandler extends BaseHandler {
* @xmlrpc.param #param("string", "Additional parameters for oscap tool.")
* @xmlrpc.returntype int - ID of the scap action created.
*/
- // TODO: Date ... earliest occurence
+ public int scheduleXccdfScan(String sessionKey, Integer sid,
+ String xccdfPath, String oscapParams) {
+ return scheduleXccdfScan(sessionKey, sid, xccdfPath, oscapParams, new Date());
+ }
+
+ /**
+ * Run Open Scap XCCDF Evaluation on a given server at a given time.
+ * @param sessionKey The session key.
+ * @param sid The server id.
+ * @param xccdfPath The path to xccdf path.
+ * @param oscapParams The additional params for oscap tool.
+ * @param date The date of earliest occurence
+ * @return ID of the new scap action.
+ *
+ * @xmlrpc.doc Schedule Scap XCCDF scan.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param("int", "serverId")
+ * @xmlrpc.param #param("string", "Path to xccdf content on targeted system.")
+ * @xmlrpc.param #param("string", "Additional parameters for oscap tool.")
+ * @xmlrpc.param #param_desc("dateTime.iso8601","date",
+ * "The date to schedule the action")
+ * @xmlrpc.returntype int - ID of the scap action created.
+ */
// TODO: multiple server instances at once
// TODO: install all the needed stuff
public int scheduleXccdfScan(String sessionKey, Integer sid,
- String xccdfPath, String oscapParams) {
+ String xccdfPath, String oscapParams, Date date) {
User loggedInUser = getLoggedInUser(sessionKey);
Server server = SystemManager.lookupByIdAndUser(new Long(sid.longValue()),
loggedInUser);
ScapAction action = ActionManager.scheduleXccdfEval(loggedInUser, server,
- xccdfPath, oscapParams, new Date());
+ xccdfPath, oscapParams, date);
return action.getId().intValue();
}
}
12 years
Changes to 'refs/tags/status_log_acceptor-0.12.11-1'
by StephenHerr
Tag 'status_log_acceptor-0.12.11-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-24 22:06 +0000
Tagging package [status_log_acceptor] version [0.12.11-1] in directory [monitoring/status_log_acceptor/].
Changes since spacewalk-utils-1.8.10-1:
Stephen Herr (2):
815964 - update monitoring probes in small batches to reduce the chance of a deadlock
Automatic commit of package [status_log_acceptor] release [0.12.11-1].
---
backend/rhn-conf/rhn.conf | 2 ++
backend/server/rhn.conf.sample | 1 +
monitoring/status_log_acceptor/AcceptStatusLog.pm | 9 +++++++++
monitoring/status_log_acceptor/status_log_acceptor.spec | 6 +++++-
rel-eng/packages/status_log_acceptor | 2 +-
5 files changed, 18 insertions(+), 2 deletions(-)
---
12 years
2 commits - backend/rhn-conf backend/server monitoring/status_log_acceptor rel-eng/packages
by StephenHerr
backend/rhn-conf/rhn.conf | 2 ++
backend/server/rhn.conf.sample | 1 +
monitoring/status_log_acceptor/AcceptStatusLog.pm | 9 +++++++++
monitoring/status_log_acceptor/status_log_acceptor.spec | 6 +++++-
rel-eng/packages/status_log_acceptor | 2 +-
5 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit e28794caf7e466bf193cc269d5cae96b3fcf0dc2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 24 18:06:12 2012 -0400
Automatic commit of package [status_log_acceptor] release [0.12.11-1].
diff --git a/monitoring/status_log_acceptor/status_log_acceptor.spec b/monitoring/status_log_acceptor/status_log_acceptor.spec
index 797504b..575799f 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.10
+Version: 0.12.11
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
+* Tue Apr 24 2012 Stephen Herr <sherr(a)redhat.com> 0.12.11-1
+- 815964 - update monitoring probes in small batches to reduce the chance of a
+ deadlock
+
* Wed Feb 01 2012 Jan Pazdziora 0.12.10-1
- Make the Last update value not truncated to day which makes the probe state
actually green.
diff --git a/rel-eng/packages/status_log_acceptor b/rel-eng/packages/status_log_acceptor
index ad06aea..ef92859 100644
--- a/rel-eng/packages/status_log_acceptor
+++ b/rel-eng/packages/status_log_acceptor
@@ -1 +1 @@
-0.12.10-1 monitoring/status_log_acceptor/
+0.12.11-1 monitoring/status_log_acceptor/
commit 6f79cf500064b4bf0d5055fef4756351da912ad3
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 24 18:05:51 2012 -0400
815964 - update monitoring probes in small batches to reduce the chance of a deadlock
diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf
index a257157..969486c 100644
--- a/backend/rhn-conf/rhn.conf
+++ b/backend/rhn-conf/rhn.conf
@@ -13,3 +13,5 @@ log_file = /var/log/rhn/rhn.log
enable_snapshots = 1
+web.monitoring_probes_batch_size = 50
+
diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample
index 133f208..4fd075e 100644
--- a/backend/server/rhn.conf.sample
+++ b/backend/server/rhn.conf.sample
@@ -81,6 +81,7 @@ web.mail_server_errors = user0(a)redhat.com, user1(a)redhat.com
web.rhnproc_server = #FIXME
web.rhnproc_port = #FIXME
+#web.monitoring_probes_batch_size = 50
diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index 2e6a0a8..9a3f347 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -4,6 +4,7 @@ package NOCpulse::AcceptStatusLog;
use strict;
use RHN::DBI;
+use PXT::Config;
use CGI;
use NOCpulse::Config;
use LWP::UserAgent;
@@ -39,6 +40,8 @@ sub store_probe_state
my @lines = split("\n", $probe_state);
my $line;
+ my $count = 0;
+ my $probes_per_commit = PXT::Config->get('monitoring_probes_batch_size');
foreach $line (@lines)
{
@@ -73,6 +76,12 @@ sub store_probe_state
$cs_dbh->errstr, $sat_cluster_id, $probe_id));
}
+ $count ++;
+ if ( $count >= $probes_per_commit ) {
+ $count = 0;
+ $cs_dbh->commit();
+ }
+
}
$cs_dbh->commit();
12 years