modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
| 12 +
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
| 8 -
modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java
| 5
modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml
| 3
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java
| 2
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java
| 2
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java
| 2
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java
| 2
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
| 2
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
| 5
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java
| 2
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java
| 76 +++++++++-
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java
| 2
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
| 3
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
| 3
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
| 12 -
modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java
| 2
modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java
| 10 -
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java
| 2
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java
| 2
20 files changed, 116 insertions(+), 41 deletions(-)
New commits:
commit 589df77934ed96b0361db10481a2dc61d4424c16
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Feb 26 18:14:49 2010 +0100
Postgres plugin resources renamed.
diff --git
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java
index 060ee03..5236fd3 100644
---
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java
+++
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java
@@ -45,7 +45,7 @@ public class PostgresDatabaseDiscoveryComponent implements
ResourceDiscoveryComp
while (resultSet.next()) {
String databaseName = resultSet.getString("datname");
DiscoveredResourceDetails database = new
DiscoveredResourceDetails(context.getResourceType(),
- databaseName, databaseName + " Database", null, "The
" + databaseName
+ databaseName, databaseName, null, "The " + databaseName
+ " Postgres Database Instance", null, null);
database.getPluginConfiguration().put(new
PropertySimple("databaseName", databaseName));
databases.add(database);
diff --git
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java
index 5e0a83d..825a4a3 100644
---
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java
+++
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java
@@ -26,14 +26,19 @@ import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.inventory.*;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.plugins.postgres.util.PostgresqlConfFile;
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -56,6 +61,8 @@ public class PostgresDiscoveryComponent implements
ResourceDiscoveryComponent, M
private static final String PGDATA_ENV_VAR = "PGDATA";
private static final String DEFAULT_RESOURCE_DESCRIPTION = "Postgres relational
database server";
+ private static final String POSTGRES_DEFAULT_DATABASE_NAME = "postgres";
+
public Set<DiscoveredResourceDetails>
discoverResources(ResourceDiscoveryContext context) {
Set<DiscoveredResourceDetails> servers = new
LinkedHashSet<DiscoveredResourceDetails>();
@@ -140,9 +147,10 @@ public class PostgresDiscoveryComponent implements
ResourceDiscoveryComponent, M
Configuration
pluginConfiguration, @Nullable
ProcessInfo processInfo) {
String key = buildUrl(pluginConfiguration);
- String db =
pluginConfiguration.getSimple(DB_CONFIGURATION_PROPERTY).getStringValue();
- String name = "Postgres [" + db + "]";
- String version = getVersion(pluginConfiguration);
+ Connection conn = getConnection(pluginConfiguration);
+ String name = getServerResourceName(pluginConfiguration, conn);
+ String version = getVersion(pluginConfiguration, conn);
+ JDBCUtil.safeClose(conn);
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key,
name, version,
DEFAULT_RESOURCE_DESCRIPTION, pluginConfiguration, processInfo);
}
@@ -155,11 +163,12 @@ public class PostgresDiscoveryComponent implements
ResourceDiscoveryComponent, M
return url;
}
- protected static String getVersion(Configuration config) {
+ protected static String getVersion(Configuration config, Connection conn) {
String version = null;
try {
- Connection conn = buildConnection(config);
- version = conn.getMetaData().getDatabaseProductVersion();
+ if (conn != null) {
+ version = conn.getMetaData().getDatabaseProductVersion();
+ }
} catch (SQLException e) {
// TODO GH: How to put this back to the server while inventorying this
resource in an unconfigured state
log.info("Exception detecting postgres instance", e);
@@ -182,7 +191,12 @@ public class PostgresDiscoveryComponent implements
ResourceDiscoveryComponent, M
String principal =
configuration.getSimple(PRINCIPAL_CONFIGURATION_PROPERTY).getStringValue();
String credentials =
configuration.getSimple(CREDENTIALS_CONFIGURATION_PROPERTY).getStringValue();
- return DriverManager.getConnection(url, principal, credentials);
+ try {
+ return DriverManager.getConnection(url, principal, credentials);
+ } catch (SQLException e) {
+ log.info("Failed to connect to the database", e);
+ return null;
+ }
}
@Nullable
@@ -239,4 +253,52 @@ public class PostgresDiscoveryComponent implements
ResourceDiscoveryComponent, M
return configFilePath;
}
+
+ private static Connection getConnection(Configuration config) {
+ try {
+ return buildConnection(config);
+ } catch (SQLException e) {
+ log.info("Failed to connect to postgres database.", e);
+
+ return null;
+ }
+ }
+
+ public static List<String> getDatabases(Configuration pluginConfiguration) {
+ return getDatabaseNames(pluginConfiguration,
getConnection(pluginConfiguration));
+ }
+
+ private static List<String> getDatabaseNames(Configuration config, Connection
conn) {
+ Statement statement = null;
+ ResultSet resultSet = null;
+ try {
+ List<String> ret = new ArrayList<String>();
+
+ statement = conn.createStatement();
+ resultSet = statement
+ .executeQuery("SELECT *, pg_database_size(datname) FROM pg_database
where datistemplate = false");
+ while (resultSet.next()) {
+ String databaseName = resultSet.getString("datname");
+ ret.add(databaseName);
+ }
+
+ return ret;
+ } catch (SQLException e) {
+ log.info("Failed to obtain the list of databases in a postgres
instance", e);
+ return Collections.emptyList();
+ } finally {
+ JDBCUtil.safeClose(statement, resultSet);
+ }
+ }
+
+ private static String getServerResourceName(Configuration config, Connection conn) {
+ List<String> schemas = getDatabaseNames(config, conn);
+ if (schemas.size() > 0 && schemas.size() < 3) {
+ String firstDatabase = schemas.get(0);
+ String secondDatabase = schemas.get(1);
+ return POSTGRES_DEFAULT_DATABASE_NAME.equals(firstDatabase) ? secondDatabase
: firstDatabase;
+ } else {
+ return config.getSimpleValue(DB_CONFIGURATION_PROPERTY,
POSTGRES_DEFAULT_DATABASE_NAME);
+ }
+ }
}
\ No newline at end of file
diff --git
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java
index a48deb1..c0d0273 100644
---
a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java
+++
b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java
@@ -61,7 +61,7 @@ public class PostgresUserDiscoveryComponent implements
ResourceDiscoveryComponen
while (resultSet.next()) {
String userName = resultSet.getString("rolname");
DiscoveredResourceDetails service = new
DiscoveredResourceDetails(context.getResourceType(), userName,
- userName + " User", null, "A Postgres user",
null, null);
+ userName, null, "A Postgres user", null, null);
service.getPluginConfiguration().put(new
PropertySimple("userName", userName));
discoveredUsers.add(service);
}
commit 6602a4542a782cec37f434b97cfe6089277e0eae
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Feb 25 09:39:07 2010 +0100
IIS plugin resources renamed.
diff --git
a/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java
b/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java
index 50b9448..f4cbceb 100644
---
a/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java
+++
b/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java
@@ -78,7 +78,7 @@ public class IISServerDiscoveryComponent implements
ResourceDiscoveryComponent {
Configuration pluginConfig = discoveryContext.getDefaultPluginConfiguration();
DiscoveredResourceDetails details = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
- imagePath, discoveryContext.getSystemInformation().getHostname() + " IIS
Server", version, "IIS Server on "
+ imagePath, "IIS", version, "IIS Server on "
+ discoveryContext.getSystemInformation().getHostname(), pluginConfig,
null);
return Collections.singleton(details);
diff --git
a/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java
b/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java
index 9ea5aa9..a6fc8a1 100644
---
a/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java
+++
b/modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java
@@ -86,7 +86,7 @@ public class IISVHostDiscoveryComponent implements
ResourceDiscoveryComponent<II
config.put(new PropertySimple("logDirectory",
"C:\\Windows\\System32\\LogFiles\\W3SVC" + info.getId()));
DiscoveredResourceDetails details = new
DiscoveredResourceDetails(resourceDiscoveryContext
- .getResourceType(), siteName, siteName + " VHost",
"1.0", siteName + " Virtual Host", config, null);
+ .getResourceType(), siteName, siteName, "1.0", siteName +
" Virtual Host", config, null);
hostDetails.add(details);
}
commit bc19e61c3b7fc42f1aec1dc603ed6c637f3d7b79
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Feb 24 18:34:18 2010 +0100
Virt plugin resources renamed.
diff --git
a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java
b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java
index fe7b2ce..98f1979 100644
---
a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java
+++
b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java
@@ -49,7 +49,7 @@ public class VirtualizationBlockDeviceDiscoveryComponent implements
ResourceDisc
String device =
intf.getSimple("targetDevice").getStringValue();
DiscoveredResourceDetails detail = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
- device, device + " virtual device", null, "Virtual
block device", null, null);
+ device, device, null, "Virtual block device", null, null);
details.add(detail);
}
}
diff --git
a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java
b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java
index 7829c9f..7d769d6 100644
---
a/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java
+++
b/modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java
@@ -49,7 +49,7 @@ public class VirtualizationInterfaceDiscoveryComponent implements
ResourceDiscov
String path = intf.getSimple("target").getStringValue();
DiscoveredResourceDetails detail = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
- path, path + " virtual interface", null, "Virtual
network interface", null, null);
+ path, path, null, "Virtual network interface", null,
null);
details.add(detail);
}
}
commit 51cd46a911b27118e02ccc589dda2952c17af66a
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Feb 24 11:19:36 2010 +0100
Snmptrapd plugin resources renamed.
diff --git
a/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java
b/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java
index ec741a4..aab6d6e 100644
---
a/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java
+++
b/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java
@@ -37,6 +37,8 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
*/
public class SnmpTrapdDiscovery implements
ResourceDiscoveryComponent<SnmpTrapdComponent>,
ManualAddFacet<SnmpTrapdComponent> {
+ private static final String PORT_PROPERTY = "port";
+
/*
* Autodiscovery is not supported.
*/
@@ -52,11 +54,11 @@ public class SnmpTrapdDiscovery implements
ResourceDiscoveryComponent<SnmpTrapdC
*/
public DiscoveredResourceDetails discoverResource(Configuration pluginConfiguration,
ResourceDiscoveryContext<SnmpTrapdComponent> ctx) throws
InvalidPluginConfigurationException {
-
- String pcName = ctx.getPluginContainerName();
- String key = "Trapd (" + pcName + ")";
+
+ String port = pluginConfiguration.getSimpleValue(PORT_PROPERTY, null);
+ String key = "Trapd " + port;
String name = key;
- String description = "SNMP Trap receiver on " + pcName;
+ String description = "SNMP Trap receiver on port " + port;
ResourceType resourceType = ctx.getResourceType();
DiscoveredResourceDetails details = new DiscoveredResourceDetails(resourceType,
key, name, null, description,
pluginConfiguration, null);
commit 7e2477a7d75fe8ff2de499f3b1143022b3d8e385
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 17:50:48 2010 +0100
Script2 plugin resources renamed.
diff --git
a/modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java
b/modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java
index 25411ee..4847261 100644
---
a/modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java
+++
b/modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java
@@ -47,7 +47,7 @@ public class ScriptDiscovery implements
ResourceDiscoveryComponent,ManualAddFace
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
context.getResourceType(), // ResourceType
key, // resource key
- "Script " + lang + "::" + script, // resource name
TODO get via configuration
+ script, // resource name TODO get via configuration
null, // version
lang + "Script " + script, // Description
pluginConfiguration, // Configuration
commit e167b466c5a2b32c64bc2b8afe83e1213eb12460
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 17:48:06 2010 +0100
RHQ Server plugin resources renamed.
diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
index 3b0b5da..1cc0925 100644
--- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
@@ -19,7 +19,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq:service=AlertConditionCacheMonitor"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Alerts Engine Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Alert
Subsystem"/>
<c:simple-property name="descriptionTemplate"
default="Statistics for the RHQ Server Alerts Engine Subsystem."/>
</plugin-configuration>
@@ -88,7 +88,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq:service=MeasurementMonitor"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Measurement Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Measurement
Subsystem"/>
<c:simple-property name="descriptionTemplate"
default="Statistics for the RHQ Server Measurement Subsystem."/>
</plugin-configuration>
@@ -144,7 +144,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq:service=GroupDefinitionRecalculationThreadMonitor"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Group Definition / DynaGroups Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Group
Definition Subsystem"/>
<c:simple-property name="descriptionTemplate"
default="Statistics for the RHQ Server Group Definition / DynaGroups
Subsystem."/>
</plugin-configuration>
@@ -189,7 +189,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq:service=ServerCommunications"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Communications Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Communications
Subsystem"/>
<c:simple-property name="descriptionTemplate" default="Details
on communications with agents"/>
</plugin-configuration>
@@ -265,7 +265,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq.remoting:type=RemoteApiMetrics"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Remote API Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Remote API
Subsystem"/>
<c:simple-property name="descriptionTemplate" default="Details
on remote API communications with external clients, including the CLI"/>
</plugin-configuration>
@@ -309,7 +309,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="rhq.serverplugin:service=ServerPluginService"/>
- <c:simple-property name="nameTemplate" default="RHQ Server
Plugin Subsystem"/>
+ <c:simple-property name="nameTemplate" default="Plugin
Subsystem"/>
<c:simple-property name="descriptionTemplate" default="Details
on the server-side plugin container subsystem"/>
</plugin-configuration>
commit bdf73e8c82c4568ea9a52b678d0b67b82926ffde
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 17:44:00 2010 +0100
RHQ agent plugin resources renamed.
diff --git
a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
index 9580b69..52d9ac2 100644
---
a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
+++
b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java
@@ -65,8 +65,7 @@ public class AgentDiscoveryComponent implements
ResourceDiscoveryComponent {
try {
AgentManagementMBean mbean = getAgentManagementMBean();
- String agentName =
mbean.getAgentConfiguration().getProperty(AgentConfigurationConstants.NAME);
- String name = agentName + " RHQ Agent";
+ String name = "RHQ Agent";
String key = name; // our key IS our name - its unique since there is only
one per platform
String version = mbean.getVersion();
String description = "RHQ Management Agent";
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index ab76cb6..45af5ba 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -13,7 +13,8 @@
<server name="RHQ Agent"
discovery="AgentDiscoveryComponent"
class="AgentServerComponent"
- description="Management Agent">
+ description="Management Agent"
+ singleton="true">
<plugin-configuration>
<c:group name="event" displayName="Log Tracking">
commit f0ba96ddb125030a5ce73106e47b33fc03a11c9d
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 15:06:09 2010 +0100
Platforms plugin resources renamed.
diff --git
a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
index dbd207f..b7960c2 100644
---
a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
+++
b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java
@@ -63,10 +63,9 @@ public class FileSystemDiscoveryComponent implements
ResourceDiscoveryComponent<
}
Configuration pluginConfig =
discoveryContext.getDefaultPluginConfiguration();
try {
- String name = ((hostname == null) ? "" : (hostname + "
")) + " File System ("
- + fs.getFileSystem().getTypeName() + ") " +
fs.getMountPoint();
+ String key = fs.getMountPoint();
DiscoveredResourceDetails details = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
- fs.getMountPoint(), name, null, fs.getFileSystem().getDevName() +
": "
+ key, key, null, fs.getFileSystem().getDevName() + ": "
+ fs.getFileSystem().getDirName(), pluginConfig, null);
results.add(details);
} catch (Exception e) {
commit 0790ffbfc48e7e7dd9eb43a43510282861f1bbd0
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 15:03:22 2010 +0100
Oracle plugin resources renamed.
diff --git
a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java
b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java
index 985058a..2340f0b 100644
---
a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java
+++
b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java
@@ -92,7 +92,7 @@ public class OracleDiscoveryComponent implements
ResourceDiscoveryComponent, Man
Configuration pluginConfig, String version, @Nullable
ProcessInfo processInfo) {
String key = pluginConfig.getSimpleValue("sid", "XE");
- String name = "Oracle (" + key + ")";
+ String name = key;
String description = "Oracle " + version + " (" + key +
")";
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key,
name, version, description,
pluginConfig, processInfo);
diff --git a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
index 9478f12..11eb232 100644
--- a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
@@ -580,7 +580,7 @@
<c:simple-property name="table"
default="DBA_USERS"/>
<c:simple-property name="metricQuery" default="SELECT *
FROM DBA_USERS"/>
<c:simple-property name="keyColumn"
default="username"/>
- <c:simple-property name="name" default="Oracle User -
{key}"/>
+ <c:simple-property name="name" default="{key}"/>
<c:simple-property name="description" default="Oracle
User"/>
</plugin-configuration>
commit 112fadec0620f71058ca4f422753b6d3fe67a28c
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 14:54:13 2010 +0100
Jira plugin resources renamed.
diff --git
a/modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java
b/modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java
index 1585ba0..7349dfc 100644
---
a/modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java
+++
b/modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java
@@ -50,7 +50,7 @@ public class JiraServerDiscoveryComponent implements
ResourceDiscoveryComponent,
new DiscoveredResourceDetails(
resourceDiscoveryContext.getResourceType(),
url,
- "Jira " + url,
+ url,
info.getVersion(),
info.getEdition(),
config,
commit 58b5f646641ffa0b2acb5ee117873f564b503deb
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 23 14:47:26 2010 +0100
Grub plugin resources renamed.
diff --git
a/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java
b/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java
index 53022f1..4233bab 100644
--- a/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java
+++ b/modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java
@@ -21,6 +21,8 @@ package org.rhq.plugins.grub;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
+
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
@@ -38,8 +40,9 @@ public class GrubDiscoveryComponent implements
ResourceDiscoveryComponent {
File grubFile = new File("/etc/grub.conf");
if (grubFile.exists()) {
+ ResourceType resourceType = resourceDiscoveryContext.getResourceType();
DiscoveredResourceDetails resource =
- new DiscoveredResourceDetails(resourceDiscoveryContext.getResourceType(),
"grub", "GRUB Boot Loader",
+ new DiscoveredResourceDetails(resourceType, "grub",
resourceType.getName(),
"1.0", "GRUB configuration on the machine.",
null, null);
details.add(resource);
diff --git a/modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml
index bf4d069..b5f9ab8 100644
--- a/modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml
@@ -11,7 +11,8 @@
<server name="GRUB"
description="The GRUB boot loader"
discovery="GrubDiscoveryComponent"
- class="GrubComponent">
+ class="GrubComponent"
+ singleton="true">
<plugin-configuration>
<c:group name="augeas" displayName="Augeas Settings">
commit 881e397532a18850d9c9d01e6bea00816dd2b277
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Feb 16 13:40:10 2010 +0100
Slight updates to the apache resource names.
diff --git
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
index f19f2e3..b87b3d6 100644
---
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
+++
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
@@ -21,6 +21,7 @@ package org.rhq.plugins.apache;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.URI;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -216,7 +217,15 @@ public class ApacheServerDiscoveryComponent implements
ResourceDiscoveryComponen
Configuration pluginConfig, ProcessInfo processInfo, ApacheBinaryInfo binaryInfo)
throws Exception {
String httpdConf =
pluginConfig.getSimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF).getStringValue();
String version = binaryInfo.getVersion();
- String name = httpdConf;
+ String serverUrl =
pluginConfig.getSimpleValue(ApacheServerComponent.PLUGIN_CONFIG_PROP_URL, null);
+ //use the server url if we could detect it, otherwise use something unique
+ String name;
+ if (serverUrl == null) {
+ name = httpdConf;
+ } else {
+ URI uri = new URI(serverUrl);
+ name = uri.getHost() + ":" + uri.getPort();
+ }
DiscoveredResourceDetails resourceDetails = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
httpdConf, name, version, PRODUCT_DESCRIPTION, pluginConfig, processInfo);
diff --git
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
index 024517f..ad8ab5e 100644
---
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
+++
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
@@ -251,7 +251,7 @@ public class ApacheVirtualHostServiceDiscoveryComponent implements
ResourceDisco
}
DiscoveredResourceDetails mainServer = new
DiscoveredResourceDetails(resourceType,
- ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY, "Main
Server", null, null,
+ ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY, "Main",
null, null,
mainServerPluginConfig, null);
discoveredResources.add(mainServer);
}
commit 29e014aca53d7d1ab417005f81a204069f1d9ae7
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Feb 15 13:12:13 2010 +0100
apache renaming
diff --git
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
index dae7df0..f19f2e3 100644
---
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
+++
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
@@ -216,8 +216,7 @@ public class ApacheServerDiscoveryComponent implements
ResourceDiscoveryComponen
Configuration pluginConfig, ProcessInfo processInfo, ApacheBinaryInfo binaryInfo)
throws Exception {
String httpdConf =
pluginConfig.getSimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF).getStringValue();
String version = binaryInfo.getVersion();
- String hostname = discoveryContext.getSystemInformation().getHostname();
- String name = hostname + " Apache " + version + " (" +
httpdConf + ")";
+ String name = httpdConf;
DiscoveredResourceDetails resourceDetails = new
DiscoveredResourceDetails(discoveryContext.getResourceType(),
httpdConf, name, version, PRODUCT_DESCRIPTION, pluginConfig, processInfo);
diff --git
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
index 7e41eb4..024517f 100644
---
a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
+++
b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java
@@ -135,11 +135,11 @@ public class ApacheVirtualHostServiceDiscoveryComponent implements
ResourceDisco
ApacheVirtualHostServiceComponent.RESPONSE_TIME_LOG_FILE_CONFIG_PROP,
rtLogFile.toString());
pluginConfiguration.put(rtLogProp);
- String resourceName = "Virtual Host ";
+ String resourceName;
if (serverName != null) {
- resourceName += address.host + ":" + address.port;
+ resourceName = address.host + ":" + address.port;
} else {
- resourceName += resourceKey;
+ resourceName = resourceKey;
}
discoveredResources.add(new DiscoveredResourceDetails(resourceType,
resourceKey, resourceName, null, null,