grafana ok

lhpqaq · Dec 9, 2024 · 053c86f · 053c86f
1 parent b630ff0
commit 053c86f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml
@@ -28,7 +28,7 @@
             results, and can trigger alerts when specified conditions are observed.
         </desc>
         <version>2.54.0</version>
-        <user>prometheus</user>
+        <user>lhp</user>
 
         <components>
             <component>

diff --git a/bigtop-manager-stack/bigtop-manager-stack-core/pom.xml b/bigtop-manager-stack/bigtop-manager-stack-core/pom.xml
@@ -54,5 +54,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...stack-core/src/main/java/org/apache/bigtop/manager/stack/core/spi/PrioritySPIFactory.java b/...stack-core/src/main/java/org/apache/bigtop/manager/stack/core/spi/PrioritySPIFactory.java
@@ -46,6 +46,9 @@ public Map<String, T> getSPIMap() {
 
     private void resolveConflict(T newSPI) {
         T oldSPI = map.get(newSPI.getName());
+        log.info(String.valueOf(oldSPI.getPriority()));
+        log.info(String.valueOf(oldSPI.getName()));
+        log.info(String.valueOf(newSPI.getName()));
 
         if (newSPI.compareTo(oldSPI.getPriority()) == 0) {
             throw new IllegalArgumentException(String.format(

diff --git a/...fra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java b/...fra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaParams.java
@@ -45,6 +45,6 @@ public String dataDir() {
 
     @Override
     public String getServiceName() {
-        return "prometheus";
+        return "grafana";
     }
 }
diff --git a/...c/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaServerScript.java b/...c/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaServerScript.java
@@ -18,6 +18,7 @@
  */
 package org.apache.bigtop.manager.stack.infra.v1_0_0.grafana;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.shell.ShellResult;
 import org.apache.bigtop.manager.stack.core.exception.StackException;
 import org.apache.bigtop.manager.stack.core.spi.param.Params;
@@ -31,6 +32,7 @@
 import java.util.Properties;
 
 @AutoService(Script.class)
+@Slf4j
 public class GrafanaServerScript extends AbstractServerScript {
 
     @Override
@@ -49,14 +51,15 @@ public ShellResult configure(Params params) {
     @Override
     public ShellResult start(Params params) {
         configure(params);
-        GrafanaParams prometheusParams = (GrafanaParams) params;
+        GrafanaParams grafanaParams = (GrafanaParams) params;
         String cmd = MessageFormat.format(
-                "nohup {0}/prometheus --config.file={0}/prometheus.yml --storage.tsdb.path={0}/data > {0}/nohup.out 2>&1 &",
-                prometheusParams.serviceHome());
+                "nohup {0}/bin/grafana server --config {0}/conf/defaults.ini --homepath {0} > {0}/nohup.out 2>&1 &",
+                grafanaParams.serviceHome());
+        log.info(cmd);
         try {
-            ShellResult shellResult = LinuxOSUtils.sudoExecCmd(cmd, prometheusParams.user());
+            ShellResult shellResult = LinuxOSUtils.sudoExecCmd(cmd, grafanaParams.user());
             if (shellResult.getExitCode() != 0) {
-                throw new StackException("Failed to start Prometheus: {0}", shellResult.getErrMsg());
+                throw new StackException("Failed to start Grafana: {0}", shellResult.getErrMsg());
             }
             long startTime = System.currentTimeMillis();
             long maxWaitTime = 5000;
@@ -77,25 +80,26 @@ public ShellResult start(Params params) {
 
     @Override
     public ShellResult stop(Params params) {
-        GrafanaParams prometheusParams = (GrafanaParams) params;
-        String cmd = MessageFormat.format("pkill -f {0}/prometheus", prometheusParams.serviceHome());
+        GrafanaParams grafanaParams = (GrafanaParams) params;
+        String cmd = MessageFormat.format("pkill -f {0}/bin/grafana", grafanaParams.serviceHome());
         try {
-            return LinuxOSUtils.sudoExecCmd(cmd, prometheusParams.user());
+            return LinuxOSUtils.sudoExecCmd(cmd, grafanaParams.user());
         } catch (Exception e) {
             throw new StackException(e);
         }
     }
 
     @Override
     public ShellResult status(Params params) {
-        GrafanaParams prometheusParams = (GrafanaParams) params;
-        String cmd = MessageFormat.format("pgrep -f {0}/prometheus", prometheusParams.serviceHome());
+        GrafanaParams grafanaParams = (GrafanaParams) params;
+        String cmd = MessageFormat.format("pgrep -f {0}/bin/grafana", grafanaParams.serviceHome());
+        log.info(cmd);
         try {
             ShellResult result = LinuxOSUtils.execCmd(cmd);
             if (result.getExitCode() == 0) {
                 return ShellResult.success();
             } else {
-                return new ShellResult(-1, "", "Prometheus is not running");
+                return new ShellResult(-1, "", "Grafana is not running");
             }
         } catch (Exception e) {
             throw new StackException(e);
@@ -104,6 +108,6 @@ public ShellResult status(Params params) {
 
     @Override
     public String getComponentName() {
-        return "prometheus_server";
+        return "grafana_server";
     }
 }
diff --git a/.../java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusServerScript.java b/.../java/org/apache/bigtop/manager/stack/infra/v1_0_0/prometheus/PrometheusServerScript.java
@@ -18,6 +18,7 @@
  */
 package org.apache.bigtop.manager.stack.infra.v1_0_0.prometheus;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.shell.ShellResult;
 import org.apache.bigtop.manager.stack.core.exception.StackException;
 import org.apache.bigtop.manager.stack.core.spi.param.Params;
@@ -31,6 +32,7 @@
 import java.util.Properties;
 
 @AutoService(Script.class)
+@Slf4j
 public class PrometheusServerScript extends AbstractServerScript {
 
     @Override
@@ -53,6 +55,7 @@ public ShellResult start(Params params) {
         String cmd = MessageFormat.format(
                 "nohup {0}/prometheus --config.file={0}/prometheus.yml --storage.tsdb.path={0}/data > {0}/nohup.out 2>&1 &",
                 prometheusParams.serviceHome());
+        log.info(cmd);
         try {
             ShellResult shellResult = LinuxOSUtils.sudoExecCmd(cmd, prometheusParams.user());
             if (shellResult.getExitCode() != 0) {