Move collector alerting into collector analysis module.

apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml → apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector-alerting</artifactId>
+        <artifactId>analysis-alarm</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-alerting-define</artifactId>
+    <artifactId>alarm-define</artifactId>
     <packaging>jar</packaging>
 
-</project>
+</project>
\ No newline at end of file

apm-collector/apm-collector-alerting/collector-alerting-define/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModule.java → apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java

@@ -16,17 +16,16 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.alerting;
+package org.apache.skywalking.apm.collector.analysis.alarm.define;
 
 import org.apache.skywalking.apm.collector.core.module.Module;
 
 /**
  * @author peng-yongsheng
  */
-public class AlertingModule extends Module {
+public class AnalysisAlarmModule extends Module {
 
-    public static final String NAME = "alerting";
+    public static final String NAME = "analysis_alarm";
 
     @Override public String name() {
         return NAME;

apm-collector/apm-collector-alerting/collector-alerting-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module → apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module

@@ -16,5 +16,4 @@
 #
 #
 
-
-org.apache.skywalking.apm.collector.alerting.AlertingModule
+org.apache.skywalking.apm.collector.analysis.alarm.define.AnalysisAlarmModule
\ No newline at end of file

apm-collector/apm-collector-alerting/pom.xml → apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml

@@ -21,24 +21,20 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector</artifactId>
+        <artifactId>analysis-alarm</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-collector-alerting</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>collector-alerting-define</module>
-        <module>collector-alerting-provider</module>
-    </modules>
+    <artifactId>alarm-provider</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-collector-core</artifactId>
+            <artifactId>alarm-define</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file

apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModuleProvider.java → apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AlertingModuleProvider.java

@@ -16,15 +16,13 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.alerting;
+package org.apache.skywalking.apm.collector.analysis.alarm.provider;
 
 import java.util.Properties;
-import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
+import org.apache.skywalking.apm.collector.analysis.alarm.define.AnalysisAlarmModule;
 import org.apache.skywalking.apm.collector.core.module.Module;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.apache.skywalking.apm.collector.storage.StorageModule;
 
 /**
  * @author peng-yongsheng
@@ -36,7 +34,7 @@ public class AlertingModuleProvider extends ModuleProvider {
     }
 
     @Override public Class<? extends Module> module() {
-        return AlertingModule.class;
+        return AnalysisAlarmModule.class;
     }
 
     @Override public void prepare(Properties config) throws ServiceNotProvidedException {
@@ -52,6 +50,6 @@ public class AlertingModuleProvider extends ModuleProvider {
     }
 
     @Override public String[] requiredModules() {
-        return new String[] {AgentStreamModule.NAME, StorageModule.NAME};
+        return new String[] {};
     }
 }

apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListAggregationWorker.java → apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.alerting.worker;
+package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker;
 
 import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;

apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java → apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.alerting.worker;
+package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker;
 
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;

apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider → apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider

@@ -16,5 +16,23 @@
 #
 #
 
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+#
+
 
-org.apache.skywalking.apm.collector.alerting.AlertingModuleProvider
+org.apache.skywalking.apm.collector.analysis.alarm.provider.AlertingModuleProvider

apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml → apm-collector/apm-collector-analysis/analysis-alarm/pom.xml

@@ -21,35 +21,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector-alerting</artifactId>
+        <artifactId>apm-collector-analysis</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-alerting-provider</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>analysis-alarm</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>alarm-define</module>
+        <module>alarm-provider</module>
+    </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-alerting-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-stream-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-storage-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-collector-stream</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-analysis/pom.xml

@@ -32,6 +32,7 @@
     <modules>
         <module>analysis-segment-parser</module>
         <module>analysis-layer-register</module>
+        <module>analysis-alarm</module>
     </modules>
 
     <dependencies>