Merge pull request #228 from suahlingo/refactor/java-module

Refactor/java module

Author: kyuengmanKim

java-module/grafana/run.sh

@@ -177,8 +177,17 @@ RESPONSE=$(curl -s -b ~/grafana-cookie -XGET \
     -H 'Accept: */*' \
     -H 'Content-Type: application/json' \
     -H 'Origin: http://127.0.0.1:3000')
-DATA_SOURCE_INFLUXDB_UID=$(echo $RESPONSE | sed -n 's/.*"uid":"\([^"]*\)".*/\1/p')
-echo DATA_SOURCE_INFLUXDB_UID=$DATA_SOURCE_INFLUXDB_UID >> ~/env.grafana
+INFLUX1_UID=$(echo $RESPONSE | sed -n 's/.*"uid":"\([^"]*\)".*/\1/p')
+echo "INFLUX1_UID=$INFLUX1_UID" >> ~/env.grafana
+
+
+RESPONSE=$(curl -s -b ~/grafana-cookie -XGET \
+    "http://127.0.0.1:3000/api/datasources/name/InfluxDB-2" \
+    -H 'Accept: */*' \
+    -H 'Content-Type: application/json' \
+    -H 'Origin: http://127.0.0.1:3000')
+INFLUX2_UID=$(echo $RESPONSE | sed -n 's/.*"uid":"\([^"]*\)".*/\1/p')
+echo "INFLUX2_UID=$INFLUX2_UID" >> ~/env.grafana
 
 echo "[*] Deleting cookie..."
 rm -f ~/grafana-cookie

java-module/mc-o11y-manager/src/test/java/com/mcmp/o11ymanager/manager/controller/InfluxDBControllerTest.java

@@ -224,8 +224,12 @@ void getMetricsByNsIdAndMciId() throws Exception {
                                                         "fields[].field",
                                                         "Field name (e.g., usage_idle)")
                                                 .optional(),
-                                        fieldArray("conditions", "List of condition filters"),
-                                        fieldString("conditions[].key", "Condition key (e.g., cpu)")
+                                        fieldArray(
+                                                "conditions",
+                                                "List of condition filters (excluding default keys: ns_id, mci_id)"),
+                                        fieldString(
+                                                        "conditions[].key",
+                                                        "Condition key (e.g., cpu) — omit ns_id, mci_id since they are added by default")
                                                 .optional(),
                                         fieldString(
                                                         "conditions[].value",
@@ -314,8 +318,12 @@ void getMetricsByVMId() throws Exception {
                                                         "fields[].field",
                                                         "Field name (e.g., usage_idle)")
                                                 .optional(),
-                                        fieldArray("conditions", "List of condition filters"),
-                                        fieldString("conditions[].key", "Condition key (e.g., cpu)")
+                                        fieldArray(
+                                                "conditions",
+                                                "List of condition filters (excluding default keys: ns_id, mci_id, vm_id)"),
+                                        fieldString(
+                                                        "conditions[].key",
+                                                        "Condition key (e.g., cpu) — omit ns_id, mci_id, vm_id since they are added by default")
                                                 .optional(),
                                         fieldString(
                                                         "conditions[].value",

java-module/slack_user_guide.md

@@ -47,4 +47,14 @@ to receive mc-o11y events and alarms within a Slack workspace.
 
 ## Step 6: Use Token
 
-1. After that, when using the mc-o11y event/alarm slack user registration API(POST /api/o11y/trigger/policy/{policySeq}/alert/slack), you can enter the pre-generated **Bot User OAuth token**.
+1. After that, when using the mc-o11y event/alarm slack user registration API(POST /api/o11y/trigger/policy/{id}/channel, you can enter the pre-generated **Bot User OAuth token**.
+2. This token is required for mc-o11y to send messages through your Slack bot. If the Slack Bot User OAuth Token is changed or reissued, make sure to **update the token value in the .env file of the mc-observability-manager** accordingly.
+
+## Step 7: Use Channel ID
+
+1. When sending messages to Slack via the API, you must use the Channel ID of a public channel where the app has been added.
+The Channel ID can be found in the Slack channel URL.
+
+2. You need to copy this value and use it as the value of the **recipients** field.
+   https://app.slack.com/client/<WORKSPACE_ID>/**<CHANNEL_ID>**
+

java-module/swagger/MC-Observability Swagger(OpenAPI 2.0).yaml

@@ -1674,14 +1674,14 @@ definitions:
         description: Result limit count
       group_by:
         type: array
-        description: "List of group-by fields, for example: ns_id, mci_id"
+        description: "List of group-by fields (e.g., vm_id)"
         items: {}
       range:
         type: string
         description: "Query range (e.g., 1h)"
       conditions:
         type: array
-        description: List of condition filters
+        description: "List of condition filters (excluding default keys: ns_id, mci_id)"
         items:
           type: object
           properties:
@@ -1690,7 +1690,8 @@ definitions:
               description: "Condition value (e.g., cpu-total)"
             key:
               type: string
-              description: "Condition key (e.g., cpu)"
+              description: "Condition key (e.g., cpu) — omit ns_id, mci_id since they\
+                \ are added by default"
       fields:
         type: array
         description: List of fields to query

java-module/swagger/MC-Observability Swagger(OpenAPI 3.0).yaml

@@ -1481,16 +1481,19 @@ components:
           description: "Query range (e.g., 1h)"
         conditions:
           type: array
-          description: List of condition filters
+          description: "List of group-by fields (e.g., vm_id)"
           items:
             type: object
             properties:
               value:
                 type: string
                 description: "Condition value (e.g., cpu-total)"
+                nullable: true
               key:
                 type: string
-                description: "Condition key (e.g., cpu)"
+                description: "Condition key (e.g., cpu) — omit ns_id, mci_id since\
+                  \ they are added by default"
+                nullable: true
         fields:
           type: array
           description: List of fields to query

java-module/swagger/swagger.yaml

@@ -2647,23 +2647,27 @@ definitions:
         description: Result limit count
       group_by:
         type: array
-        description: "List of group-by fields, for example: ns_id, mci_id"
+        description: "List of group-by fields (e.g., vm_id)"
         items: { }
       range:
         type: string
         description: "Query range (e.g., 1h)"
       conditions:
         type: array
-        description: List of condition filters
+        description: "List of condition filters (excluding default keys: ns_id,\
+          \ mci_id, \ vm_id)"
         items:
           type: object
           properties:
             value:
               type: string
               description: "Condition value (e.g., cpu-total)"
+              nullable: true
             key:
               type: string
-              description: "Condition key (e.g., cpu)"
+              description: "Condition key (e.g., cpu) — omit ns_id, mci_id or vm_id since\
+                \ they are added by default"
+              nullable: true
       fields:
         type: array
         description: List of fields to query