Merge pull request #252 from hawkular/hawkular-next

hawkular-next goes to master
hawkular · Jun 25, 2015 · 6f31ef8 · 6f31ef8
2 parents f1220f4 + 050127a
commit 6f31ef8
Show file tree

Hide file tree

Showing 28 changed files with 888 additions and 222 deletions.
diff --git a/dist/assembly.xml b/dist/assembly.xml
@@ -110,7 +110,7 @@
         <include>org.hawkular.alerts:hawkular-alerts-ear</include>
         <include>org.hawkular.alerts:hawkular-actions-email</include>
         <include>org.hawkular.metrics:hawkular-metrics-api-jaxrs</include>
-        <include>org.hawkular.metrics:hawkular-metrics-embedded-cassandra-ear</include>
+        <include>org.hawkular.commons:hawkular-commons-embedded-cassandra-ear</include>
       </includes>
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <unpack>false</unpack>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -97,8 +97,8 @@
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.hawkular.metrics</groupId>
-      <artifactId>hawkular-metrics-embedded-cassandra-ear</artifactId>
+      <groupId>org.hawkular.commons</groupId>
+      <artifactId>hawkular-commons-embedded-cassandra-ear</artifactId>
       <type>ear</type>
     </dependency>
     <dependency>
@@ -128,6 +128,12 @@
     </dependency>
 
     <!-- Keycloak-related dependencies -->
+    <dependency>
+      <groupId>org.keycloak</groupId>
+      <artifactId>keycloak-wf9-modules</artifactId>
+      <version>${version.org.keycloak}</version>
+      <type>zip</type>
+    </dependency>
     <dependency>
       <groupId>org.hawkular.accounts</groupId>
       <artifactId>hawkular-accounts-keycloak-theme</artifactId>
@@ -158,6 +164,12 @@
                   <version>${version.org.keycloak}</version>
                   <outputDirectory>${project.build.directory}/keycloak</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.keycloak</groupId>
+                  <artifactId>keycloak-wf9-modules</artifactId>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/keycloak/modules/system/layers/base</outputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>

diff --git a/dist/src/main/resources/wildfly/configuration/default-broker.xml b/dist/src/main/resources/wildfly/configuration/default-broker.xml
@@ -23,19 +23,19 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.apache.org/schema/core"
-          brokerName="${org.hawkular.bus.broker.name}"
-          persistent="${org.hawkular.bus.broker.persistent}"
-          useJmx="${org.hawkular.bus.broker.use-jmx}"
+          brokerName="${org-hawkular-bus-broker-name}"
+          persistent="${org-hawkular-bus-broker-persistent}"
+          useJmx="${org-hawkular-bus-broker-use-jmx}"
           dataDirectory="${jboss.server.data.dir}/broker"
           useShutdownHook="false">
 
     <transportConnectors>
-      <transportConnector name="${org.hawkular.bus.broker.connector.name}"
-                          uri="${org.hawkular.bus.broker.connector.protocol}://${org.hawkular.bus.broker.connector.address}:${org.hawkular.bus.broker.connector.port}"
+      <transportConnector name="${org-hawkular-bus-broker-connector-name}"
+                          uri="${org-hawkular-bus-broker-connector-protocol}://${org-hawkular-bus-broker-connector-address}:${org-hawkular-bus-broker-connector-port}"
                           updateClusterClients="true"
                           updateClusterClientsOnRemove="true"
                           rebalanceClusterClients="true"
-                          discoveryUri="multicast://${org.hawkular.bus.broker.discovery.address}:${org.hawkular.bus.broker.discovery.port}?group=hawkular" />
+                          discoveryUri="multicast://${org-hawkular-bus-broker-discovery-address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
     </transportConnectors>
 
     <!-- Define the Network of Brokers (aka clustering).
@@ -46,7 +46,7 @@
     -->
     <networkConnectors>
       <networkConnector
-        uri="multicast://${org.hawkular.bus.broker.discovery.address}:${org.hawkular.bus.broker.discovery.port}?group=hawkular" />
+        uri="multicast://${org-hawkular-bus-broker-discovery-address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
     </networkConnectors>
 
     <persistenceAdapter>

diff --git a/dist/src/main/resources/wildfly/patches/standalone.xsl b/dist/src/main/resources/wildfly/patches/standalone.xsl
@@ -20,9 +20,9 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:ds="urn:jboss:domain:datasources:2.0"
-                xmlns:ra="urn:jboss:domain:resource-adapters:2.0"
-                xmlns:ejb3="urn:jboss:domain:ejb3:2.0"
+                xmlns:ds="urn:jboss:domain:datasources:3.0"
+                xmlns:ra="urn:jboss:domain:resource-adapters:3.0"
+                xmlns:ejb3="urn:jboss:domain:ejb3:3.0"
                 version="2.0"
                 exclude-result-prefixes="xalan ds ra ejb3">
 
@@ -139,11 +139,8 @@
 
   <!-- set the console log level -->
   <xsl:template match="logging:console-handler[@name='CONSOLE']/logging:level"
-                xmlns:logging="urn:jboss:domain:logging:2.0">
-    <xsl:choose>
-      <xsl:when test="$kettle.build.type='dev'"><level name="DEBUG"/></xsl:when>
-      <xsl:otherwise><level name="INFO"/></xsl:otherwise>
-    </xsl:choose>
+                xmlns:logging="urn:jboss:domain:logging:3.0">
+    <xsl:if test="$kettle.build.type='production'"><level name="INFO"/></xsl:if>
   </xsl:template>
 
   <!-- add bus resource adapter -->
@@ -274,8 +271,8 @@
   <xsl:template name="system-properties">
     <system-properties>
       <property>
-        <xsl:attribute name="name">hawkular-metrics.backend</xsl:attribute>
-        <xsl:attribute name="value">&#36;{hawkular-metrics.backend:embedded_cass}</xsl:attribute>
+        <xsl:attribute name="name">hawkular.backend</xsl:attribute>
+        <xsl:attribute name="value">&#36;{hawkular.backend:embedded_cassandra}</xsl:attribute>
       </property>
 
       <xsl:choose>
@@ -304,7 +301,8 @@
   <xsl:template match="node()[name(.)='extensions']">
     <xsl:copy>
       <xsl:apply-templates select="node()|@*"/>
-      <extension module="org.keycloak.keycloak-subsystem"/>
+      <extension module="org.keycloak.keycloak-adapter-subsystem"/>
+      <extension module="org.keycloak.keycloak-server-subsystem"/>
       <extension module="org.hawkular.agent.monitor"/>
     </xsl:copy>
     <xsl:call-template name="system-properties"/>
@@ -459,7 +457,7 @@
                       timeUnits="minutes"
                       path="/"
                       attribute="wait-time" />
-          <metric-dmr name="Pool Availabile Count"
+          <metric-dmr name="Pool Available Count"
                       interval="5"
                       timeUnits="minutes"
                       path="/"
@@ -828,11 +826,10 @@
       </subsystem>
 
       <!-- Keycloak-related - our secured deployments (important) -->
-      <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
-        <auth-server name="main-auth-server">
-          <enabled>true</enabled>
-          <web-context>auth</web-context>
-        </auth-server>
+      <subsystem xmlns="urn:jboss:domain:keycloak-server:1.1">
+        <web-context>auth</web-context>
+      </subsystem>
+      <subsystem xmlns="urn:jboss:domain:keycloak:1.1">
         <realm name="hawkular">
           <auth-server-url>/auth</auth-server-url>
           <auth-server-url-for-backend-requests><xsl:text disable-output-escaping="yes">http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/auth</xsl:text></auth-server-url-for-backend-requests>

diff --git a/dist/src/main/resources/wildfly/snippets/subsystem-hawkular-bus-broker-wf-extension.xml b/dist/src/main/resources/wildfly/snippets/subsystem-hawkular-bus-broker-wf-extension.xml
@@ -20,13 +20,13 @@
            enabled="true"
            configuration-file="default-broker.xml">
 
-  <org.hawkular.bus.broker.name>org.hawkular.bus.broker.${jboss.node.name}</org.hawkular.bus.broker.name>
-  <org.hawkular.bus.broker.persistent>false</org.hawkular.bus.broker.persistent>
-  <org.hawkular.bus.broker.use-jmx>false</org.hawkular.bus.broker.use-jmx>
+  <org-hawkular-bus-broker-name>org.hawkular.bus.broker.${jboss.node.name}</org-hawkular-bus-broker-name>
+  <org-hawkular-bus-broker-persistent>false</org-hawkular-bus-broker-persistent>
+  <org-hawkular-bus-broker-use-jmx>false</org-hawkular-bus-broker-use-jmx>
 
   <connector socket-binding="org.hawkular.bus.broker"
-             org.hawkular.bus.broker.connector.name="openwire"
-             org.hawkular.bus.broker.connector.protocol="tcp" />
+             org-hawkular-bus-broker-connector-name="openwire"
+             org-hawkular-bus-broker-connector-protocol="tcp" />
 
   <discovery-socket-binding>org.hawkular.bus.broker.discovery</discovery-socket-binding>
 

diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/AvailPublisher.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/AvailPublisher.java
@@ -53,7 +53,7 @@ public class AvailPublisher {
     static {
         String host = System.getProperty("jboss.bind.address", "localhost");
         String port = System.getProperty("jboss.http.port", "8080");
-        METRICS_BASE_URI = "http://"+ host + ":"+ port + "/hawkular-metrics";
+        METRICS_BASE_URI = "http://"+ host + ":"+ port + "/hawkular/metrics";
     }
 
     // Avoid concurrent Asynchronous calls to REST services. There seems to be a serious issue with undertow and
@@ -71,8 +71,8 @@ public void sendToMetricsViaRest(List<SingleAvail> availabilities) {
             String rid = avr.id;
             String tenantId = avr.tenantId;
 
-            HttpPost request = new HttpPost(METRICS_BASE_URI + "/" + tenantId +
-                    "/metrics/availability/" + rid + "/data");
+            HttpPost request = new HttpPost(METRICS_BASE_URI + "/availability/" + rid + "/data");
+            request.addHeader("Hawkular-Tenant", tenantId);
 
             Availability availability = new Availability(avr.timestamp, avr.avail.toLowerCase());
             List<Availability> list = new ArrayList<>(1);

diff --git a/modules/avail-creator/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/modules/avail-creator/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,25 @@
+<!--
+
+    Copyright 2015 Red Hat, Inc. and/or its affiliates
+    and other contributors as indicated by the @author tags.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+  <deployment>
+    <dependencies>
+      <module name="org.hawkular.nest" />
+    </dependencies>
+  </deployment>
+</jboss-deployment-structure>
diff --git a/modules/end-to-end-test/pom.xml b/modules/end-to-end-test/pom.xml
@@ -89,6 +89,22 @@
         <hawkular.port.offset>0</hawkular.port.offset>
         <!-- $hawkular.management.port must be equal to $hawkular.port.offset + 9990 -->
         <hawkular.management.port>9990</hawkular.management.port>
+
+        <hawkular.log>INFO</hawkular.log>
+        <hawkular.log.accounts>INFO</hawkular.log.accounts>
+        <hawkular.log.agent>INFO</hawkular.log.agent>
+        <hawkular.log.alerts>INFO</hawkular.log.alerts>
+        <hawkular.log.bus>INFO</hawkular.log.bus>
+        <hawkular.log.availcreator>INFO</hawkular.log.availcreator>
+        <hawkular.log.pinger>INFO</hawkular.log.pinger>
+        <hawkular.log.inventory>INFO</hawkular.log.inventory>
+        <hawkular.log.metrics>INFO</hawkular.log.metrics>
+        <hawkular.log.nest>INFO</hawkular.log.nest>
+        <hawkular.log.datastax.driver>INFO</hawkular.log.datastax.driver>
+        <hawkular.log.liquibase>WARN</hawkular.log.liquibase>
+        <hawkular.log.cassandra>INFO</hawkular.log.cassandra>
+        <hawkular.log.ejb3>WARN</hawkular.log.ejb3>
+        <hawkular.log.rewrite>WARN</hawkular.log.rewrite>
       </properties>
       <build>
         <plugins>
@@ -134,6 +150,21 @@
                 <javaOpt>-Djava.awt.headless=true</javaOpt>
                 <javaOpt>-Djboss.bind.address=${hawkular.bind.address}</javaOpt>
                 <javaOpt>-Djboss.socket.binding.port-offset=${hawkular.port.offset}</javaOpt>
+                <javaOpt>-Dhawkular.log=${hawkular.log}</javaOpt>
+                <javaOpt>-Dhawkular.log.accounts=${hawkular.log.accounts}</javaOpt>
+                <javaOpt>-Dhawkular.log.agent=${hawkular.log.agent}</javaOpt>
+                <javaOpt>-Dhawkular.log.alerts=${hawkular.log.alerts}</javaOpt>
+                <javaOpt>-Dhawkular.log.bus=${hawkular.log.bus}</javaOpt>
+                <javaOpt>-Dhawkular.log.availcreator=${hawkular.log.availcreator}</javaOpt>
+                <javaOpt>-Dhawkular.log.pinger=${hawkular.log.pinger}</javaOpt>
+                <javaOpt>-Dhawkular.log.inventory=${hawkular.log.inventory}</javaOpt>
+                <javaOpt>-Dhawkular.log.metrics=${hawkular.log.metrics}</javaOpt>
+                <javaOpt>-Dhawkular.log.nest=${hawkular.log.nest}</javaOpt>
+                <javaOpt>-Dhawkular.log.datastax.driver=${hawkular.log.datastax.driver}</javaOpt>
+                <javaOpt>-Dhawkular.log.liquibase=${hawkular.log.liquibase}</javaOpt>
+                <javaOpt>-Dhawkular.log.cassandra=${hawkular.log.cassandra}</javaOpt>
+                <javaOpt>-Dhawkular.log.ejb3=${hawkular.log.ejb3}</javaOpt>
+                <javaOpt>-Dhawkular.log.rewrite=${hawkular.log.rewrite}</javaOpt>
               </javaOpts>
             </configuration>
             <executions>

diff --git a/...les/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy b/...les/end-to-end-test/src/test/groovy/org/hawkular/integration/test/AbstractTestBase.groovy
@@ -51,7 +51,7 @@ class AbstractTestBase {
      */
     String encodedCredentials = Base64.getMimeEncoder().encodeToString("$testUser:$testPasword".getBytes("utf-8"))
     client.defaultRequestHeaders.Authorization = "Basic "+ encodedCredentials
-
+    client.defaultRequestHeaders.Accept = ContentType.JSON
   }
 
 }