Skip to content

Commit

Permalink
Move to ISPN 9.1.1/HS 5.8 non-emebedded.
Browse files Browse the repository at this point in the history
- Remove Metrics Deployments and Cassandra support
- Remove Hawkular Nest deployments and just use vanilla WF (10.1.0)

Tech Note: WF bundles an old Infinispan that predates what is needed for
our backend cache needs. We must override the WF bom. The WF bom is
declared in the dependency management section of the root pom. Versions
imported in dependency management carry through transitive dependencies.
To ensure we get proper transitive deps (e.g. in the WAR distributions)
we now also set our version overrides for ispn/hibernateSearch in the root
pom dependency management and undeclare versions in the dependency sections
of our relevant modules.
  • Loading branch information
jshaughn authored and lucasponce committed Sep 28, 2017
1 parent f85a360 commit a32591c
Show file tree
Hide file tree
Showing 191 changed files with 8,691 additions and 10,514 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -32,14 +32,10 @@ public class ServiceNames {
public static String HAWKULAR_ALERTER_ENV = "hawkular-alerts.alerter-deployment";
public static String STANDALONE = "standalone";

private static String JNDI_ALERTS_STANDALONE = "java:global/hawkular-alerts/CassAlertsServiceImpl";
private static String JNDI_DEFINITIONS_STANDALONE = "java:global/hawkular-alerts/CassDefinitionsServiceImpl";
private static String JNDI_ALERTS_STANDALONE = "java:global/hawkular-alerts/IspnAlertsServiceImpl";
private static String JNDI_DEFINITIONS_STANDALONE = "java:global/hawkular-alerts/IspnDefinitionsServiceImpl";
private static String JNDI_PROPERTIES_STANDALONE = "java:global/hawkular-alerts/PropertiesServiceImpl";

private static String JNDI_ALERTS_METRICS = "java:global/hawkular-metrics/hawkular-alerts/CassAlertsServiceImpl";
private static String JNDI_DEFINITIONS_METRICS = "java:global/hawkular-metrics/hawkular-alerts/CassDefinitionsServiceImpl";
private static String JNDI_PROPERTIES_METRICS = "java:global/hawkular-metrics/hawkular-alerts/PropertiesServiceImpl";

public enum Service {
ALERTS_SERVICE, DEFINITIONS_SERVICE, PROPERTIES_SERVICE
}
Expand All @@ -54,15 +50,9 @@ public enum Service {
} catch (Exception e) {
// env does not need to be set, we'll default to METRICS
}
if (STANDALONE.equals(env)) {
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_STANDALONE);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_STANDALONE);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_STANDALONE);
} else {
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_METRICS);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_METRICS);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_METRICS);
}
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_STANDALONE);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_STANDALONE);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_STANDALONE);
}

public static String getServiceName(Service service) {
Expand Down
17 changes: 0 additions & 17 deletions hawkular-alerters/hawkular-elasticsearch-alerter/pom.xml
Expand Up @@ -36,16 +36,6 @@
</modules>

<profiles>
<profile>
<id>metrics</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>deployments/hawkular-elasticsearch-alerter-metrics</module>
</modules>
</profile>

<profile>
<id>standalone</id>
<activation>
Expand All @@ -55,13 +45,6 @@
<module>deployments/hawkular-elasticsearch-alerter-standalone</module>
</modules>
</profile>

<profile>
<id>openshift</id>
<modules>
<module>deployments/hawkular-elasticsearch-alerter-metrics</module>
</modules>
</profile>
</profiles>

</project>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -32,14 +32,10 @@ public class ServiceNames {
public static String HAWKULAR_ALERTER_ENV = "hawkular-alerts.alerter-deployment";
public static String STANDALONE = "standalone";

private static String JNDI_ALERTS_STANDALONE = "java:global/hawkular-alerts/CassAlertsServiceImpl";
private static String JNDI_DEFINITIONS_STANDALONE = "java:global/hawkular-alerts/CassDefinitionsServiceImpl";
private static String JNDI_ALERTS_STANDALONE = "java:global/hawkular-alerts/IspnAlertsServiceImpl";
private static String JNDI_DEFINITIONS_STANDALONE = "java:global/hawkular-alerts/IspnDefinitionsServiceImpl";
private static String JNDI_PROPERTIES_STANDALONE = "java:global/hawkular-alerts/PropertiesServiceImpl";

private static String JNDI_ALERTS_METRICS = "java:global/hawkular-metrics/hawkular-alerts/CassAlertsServiceImpl";
private static String JNDI_DEFINITIONS_METRICS = "java:global/hawkular-metrics/hawkular-alerts/CassDefinitionsServiceImpl";
private static String JNDI_PROPERTIES_METRICS = "java:global/hawkular-metrics/hawkular-alerts/PropertiesServiceImpl";

public enum Service {
ALERTS_SERVICE, DEFINITIONS_SERVICE, PROPERTIES_SERVICE
}
Expand All @@ -54,15 +50,9 @@ public enum Service {
} catch (Exception e) {
// env does not need to be set, we'll default to METRICS
}
if (STANDALONE.equals(env)) {
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_STANDALONE);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_STANDALONE);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_STANDALONE);
} else {
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_METRICS);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_METRICS);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_METRICS);
}
services.put(Service.ALERTS_SERVICE, JNDI_ALERTS_STANDALONE);
services.put(Service.DEFINITIONS_SERVICE, JNDI_DEFINITIONS_STANDALONE);
services.put(Service.PROPERTIES_SERVICE, JNDI_PROPERTIES_STANDALONE);
}

public static String getServiceName(Service service) {
Expand Down
17 changes: 0 additions & 17 deletions hawkular-alerters/hawkular-prometheus-alerter/pom.xml
Expand Up @@ -36,16 +36,6 @@
</modules>

<profiles>
<profile>
<id>metrics</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>deployments/hawkular-prometheus-alerter-metrics</module>
</modules>
</profile>

<profile>
<id>standalone</id>
<activation>
Expand All @@ -55,13 +45,6 @@
<module>deployments/hawkular-prometheus-alerter-standalone</module>
</modules>
</profile>

<profile>
<id>openshift</id>
<modules>
<module>deployments/hawkular-prometheus-alerter-metrics</module>
</modules>
</profile>
</profiles>

</project>
16 changes: 14 additions & 2 deletions hawkular-alerts-actions/hawkular-alerts-actions-api/pom.xml
Expand Up @@ -35,8 +35,20 @@

<!-- Wildfly dependencies -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit a32591c

Please sign in to comment.