Merge pull request #171 from ish-hcc/feat/refactor

java-module: Rename target to vm + some fixes

Author: ish-hcc

go/patches/000_Add_Azure_Monitoring_PoC.patch

@@ -14,13 +14,6 @@
     # Plugins File
     plugins_file /fluent-bit/etc/plugins.conf
 
-    # HTTP Server
-    http_server  On
-    http_listen  0.0.0.0
-    http_port    2020
-    Hot_Reload   On
-    Health_Check On
-
     # Storage
     storage.metrics on
 

java-module/ansible/playbooks/install-agent/roles/agent/agent-install-files/cmp-agent/fluent-bit/etc/fluent-bit.conf

@@ -1,7 +1,7 @@
 [global_tags]
   ns_id="@NS_ID"
   mci_id="@MCI_ID"
-  target_id="@TARGET_ID"
+  vm_id="@VM_ID"
 
 [agent]
   interval = "30s"

java-module/ansible/playbooks/install-agent/roles/agent/agent-install-files/cmp-agent/telegraf/etc/telegraf.conf

@@ -145,7 +145,7 @@ services:
 
   # CB-Tumblebug
   cb-tumblebug:
-    image: cloudbaristaorg/cb-tumblebug:0.11.3
+    image: cloudbaristaorg/cb-tumblebug:0.11.8
     container_name: cb-tumblebug
     build:
       context: .
@@ -214,7 +214,7 @@ services:
   # CB-Tumblebug ETCD
   # This is used for storing CB-Tumblebug metadata.
   cb-tumblebug-etcd:
-    image: gcr.io/etcd-development/etcd:v3.5.14
+    image: gcr.io/etcd-development/etcd:v3.5.21
     container_name: cb-tumblebug-etcd
     networks:
       - internal_network

java-module/docker-compose.yaml

@@ -12,7 +12,7 @@ USE mc_observability;
 CREATE TABLE `mc_o11y_insight_anomaly_setting` (
                                                    `SEQ` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
                                                    `NAMESPACE_ID` varchar(100) NOT NULL,
-                                                   `TARGET_ID` varchar(100) NOT NULL,
+                                                   `VM_ID` varchar(100) NOT NULL,
                                                    `TARGET_TYPE` varchar(100) NOT NULL,
                                                    `MEASUREMENT` varchar(100) NOT NULL,
                                                    `EXECUTION_INTERVAL` varchar(100) NOT NULL,

java-module/maria_init.sql

@@ -0,0 +1 @@
+

java-module/mc-o11y-manager/src/main/java/com/mcmp/o11ymanager/dto/influx/FieldDTO.java

@@ -1,12 +1,9 @@
 package com.mcmp.o11ymanager.exception.log;
 
-
 import com.mcmp.o11ymanager.manager.global.error.BaseException;
 import lombok.Getter;
 
-/**
- * Loki 쿼리 시간 범위가 서버 제한을 초과했을 때 발생하는 예외
- */
+/** Loki 쿼리 시간 범위가 서버 제한을 초과했을 때 발생하는 예외 */
 @Getter
 public class LokiTimeRangeExceededException extends BaseException {
     private final String queryLength;
@@ -17,4 +14,4 @@ public LokiTimeRangeExceededException(String requestId, String queryLength, Stri
         this.queryLength = queryLength;
         this.limit = limit;
     }
-}
+}

java-module/mc-o11y-manager/src/main/java/com/mcmp/o11ymanager/exception/log/LokiTimeRangeExceededException.java

@@ -0,0 +1 @@
+

java-module/mc-o11y-manager/src/main/java/com/mcmp/o11ymanager/global/error/GlobalExceptionHandler.java

@@ -6,7 +6,7 @@
 import com.mcmp.o11ymanager.manager.dto.influx.MetricRequestDTO;
 import com.mcmp.o11ymanager.manager.dto.influx.TagDTO;
 import com.mcmp.o11ymanager.manager.facade.InfluxDbFacadeService;
-import com.mcmp.o11ymanager.manager.global.target.ResBody;
+import com.mcmp.o11ymanager.manager.global.vm.ResBody;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

java-module/mc-o11y-manager/src/main/java/com/mcmp/o11ymanager/manager/controller/InfluxDBController.java

@@ -27,21 +27,20 @@ public Object getPredictionOptions() {
         return insightClient.getPredictionOptions();
     }
 
-    @PostMapping("/insight/predictions" + "/nsId/{nsId}/target/{targetId}")
+    @PostMapping("/insight/predictions" + "/nsId/{nsId}/vm/{vmId}")
     public Object predictMetric(
-            @PathVariable String nsId, @PathVariable String targetId, @RequestBody Object body) {
-        return insightClient.predictMetric(nsId, targetId, body);
+            @PathVariable String nsId, @PathVariable String vmId, @RequestBody Object body) {
+        return insightClient.predictMetric(nsId, vmId, body);
     }
 
-    @GetMapping("/insight/predictions" + "/nsId/{nsId}/target/{targetId}/history")
+    @GetMapping("/insight/predictions" + "/nsId/{nsId}/vm/{vmId}/history")
     public Object getPredictionHistory(
             @PathVariable String nsId,
-            @PathVariable String targetId,
+            @PathVariable String vmId,
             @RequestParam String measurement,
             @RequestParam(required = false) String start_time,
             @RequestParam(required = false) String end_time) {
-        return insightClient.getPredictionHistory(
-                nsId, targetId, measurement, start_time, end_time);
+        return insightClient.getPredictionHistory(nsId, vmId, measurement, start_time, end_time);
     }
 
     // insight anomaly detection
@@ -81,19 +80,19 @@ public Object deleteAnomalyDetectionSetting(@PathVariable Long settingSeq) {
         return insightClient.deleteAnomalyDetectionSetting(settingSeq);
     }
 
-    @GetMapping("/insight/anomaly-detection" + "/settings/nsId/{nsId}/target/{targetId}")
-    public Object getAnomalyDetection(@PathVariable String nsId, @PathVariable String targetId) {
-        return insightClient.getAnomalyDetection(nsId, targetId);
+    @GetMapping("/insight/anomaly-detection" + "/settings/nsId/{nsId}/vm/{vmId}")
+    public Object getAnomalyDetection(@PathVariable String nsId, @PathVariable String vmId) {
+        return insightClient.getAnomalyDetection(nsId, vmId);
     }
 
-    @GetMapping("/insight/anomaly-detection" + "/nsId/{nsId}/target/{targetId}/history")
+    @GetMapping("/insight/anomaly-detection" + "/nsId/{nsId}/vm/{vmId}/history")
     public Object getAnomalyDetectionHistory(
             @PathVariable String nsId,
-            @PathVariable String targetId,
+            @PathVariable String vmId,
             @RequestParam String measurement,
             @RequestParam(required = false) String start_time,
             @RequestParam(required = false) String end_time) {
         return insightClient.getAnomalyDetectionHistory(
-                nsId, targetId, measurement, start_time, end_time);
+                nsId, vmId, measurement, start_time, end_time);
     }
 }