diff --git a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/common/Constants.java b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/common/Constants.java index cd270633..19d853ab 100644 --- a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/common/Constants.java +++ b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/common/Constants.java @@ -9,7 +9,7 @@ public class Constants { public static final String COLLECTOR_CONFIG_PATH = CONFIG_ROOT_PATH + "/mc-observability-agent-collector.conf"; public static final String COLLECTOR_CONFIG_DIR_PATH = CONFIG_ROOT_PATH + "/conf"; - public static final String PROPERTY_NS_ID = "mc-o11y.ns-id"; - public static final String PROPERTY_MCI_ID = "mc-o11y.mci-id"; - public static final String PROPERTY_TARGET_ID = "mc-o11y.target-id"; + public static final String PROPERTY_NS_ID = "NS_ID"; + public static final String PROPERTY_MCI_ID = "MCI_ID"; + public static final String PROPERTY_TARGET_ID = "TARGET_ID"; } \ No newline at end of file diff --git a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/service/AgentService.java b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/service/AgentService.java index f2c26e9f..d84a146c 100644 --- a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/service/AgentService.java +++ b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/service/AgentService.java @@ -46,9 +46,9 @@ public boolean init() { collectorExecutor.startCollector(); - String nsId = System.getProperty(Constants.PROPERTY_NS_ID); + String nsId = System.getenv(Constants.PROPERTY_NS_ID); if( nsId == null ) nsId = ""; - String targetId = System.getProperty(Constants.PROPERTY_TARGET_ID); + String targetId = System.getenv(Constants.PROPERTY_TARGET_ID); if( targetId == null ) targetId = ""; targetMapper.updateState(nsId, targetId, "ACTIVE"); } @@ -61,9 +61,9 @@ public boolean init() { @PreDestroy public void destroy() { - String nsId = System.getProperty(Constants.PROPERTY_NS_ID); + String nsId = System.getenv(Constants.PROPERTY_NS_ID); if( nsId == null ) nsId = ""; - String targetId = System.getProperty(Constants.PROPERTY_TARGET_ID); + String targetId = System.getenv(Constants.PROPERTY_TARGET_ID); if( targetId == null ) targetId = ""; targetMapper.updateState(nsId, targetId, "INACTIVE"); } diff --git a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/util/CollectorExecutor.java b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/util/CollectorExecutor.java index 8b521ff4..67c5f9a4 100644 --- a/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/util/CollectorExecutor.java +++ b/java-module/mc-o11y-agent/src/main/java/mcmp/mc/observability/mco11yagent/monitoring/util/CollectorExecutor.java @@ -76,9 +76,9 @@ public String globalTelegrafConfig() { throw new RuntimeException(e); } - String nsId = System.getProperty(Constants.PROPERTY_NS_ID); + String nsId = System.getenv(Constants.PROPERTY_NS_ID); if( nsId == null ) nsId = ""; - String targetId = System.getProperty(Constants.PROPERTY_TARGET_ID); + String targetId = System.getenv(Constants.PROPERTY_TARGET_ID); if( targetId == null ) targetId = ""; return sb.toString().replaceAll("@NS_ID", nsId).replaceAll("@TARGET_ID", targetId); } @@ -88,9 +88,9 @@ public boolean isCollectorAlive() { } public void updateConfigFile() { - String nsId = System.getProperty(Constants.PROPERTY_NS_ID); + String nsId = System.getenv(Constants.PROPERTY_NS_ID); if( nsId == null ) nsId = ""; - String targetId = System.getProperty(Constants.PROPERTY_TARGET_ID); + String targetId = System.getenv(Constants.PROPERTY_TARGET_ID); if( targetId == null ) targetId = ""; List configList = monitoringConfigService.list(nsId, targetId); diff --git a/java-module/scripts/init.sh b/java-module/scripts/init.sh index 3934347f..d5248c5f 100644 --- a/java-module/scripts/init.sh +++ b/java-module/scripts/init.sh @@ -12,16 +12,23 @@ if [ $? -ne 0 ]; then sudo apt-get install -y docker-ce docker-ce-cli docker-compose fi -cat < mc-o11y-agent.conf -JAVA_OPTS="-Dspring.profiles.active=prd -Dmc-o11y.ns-id=$2 -Dmc-o11y.mci-id=$3 -Dmc-o11y.target-id=$4" -EOF +git --version +if [ $? -ne 0 ]; then + sudo apt-get install -y git +fi + +git clone https://github.com/m-cmp/mc-observability.git + +cd mc-observability -cat < application-prd.yaml -spring: - datasource: - driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://$1:3306/mc_observability?useUnicode=true&characterEncoding=utf8&serverTimeZone=Asia/Seoul - username: mc-agent - password: mc-agent +cat < .env +NS_ID=$2 +MCI_ID=$3 +TARGET_ID=$4 +DATABASE_HOST=$1 +DATABASE_NAME=mc-observability +DATABASE_ID=mc-agent +DATABASE_PW=mc-agent EOF +docker compose up -d \ No newline at end of file