chores

lhpqaq · Dec 9, 2024 · 3d83b62 · 3d83b62
1 parent e7d8962
commit 3d83b62
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml
@@ -46,8 +46,8 @@
                 </architectures>
                 <packages>
                     <package>
-                        <name>prometheus-2.54.0.linux-amd64.tar.gz</name>
-                        <checksum>SHA-256:465e1393a0cca9705598f6ffaf96ffa78d0347808ab21386b0c6aaec2cf7aa13</checksum>
+                        <name>grafana-enterprise-11.4.0.linux-amd64.tar.gz</name>
+                        <checksum>SHA-256:1334ef2e4232fdf5443542c6fa9b5abe25720edbf03363aa9f2d5147ba231fae</checksum>
                     </package>
                 </packages>
             </package-specific>

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,9 +46,6 @@ 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/...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
@@ -93,7 +93,6 @@ public ShellResult stop(Params params) {
     public ShellResult status(Params params) {
         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) {

diff --git a/...nfra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java b/...nfra/src/main/java/org/apache/bigtop/manager/stack/infra/v1_0_0/grafana/GrafanaSetup.java
@@ -38,6 +38,6 @@ public static ShellResult config(Params params) {
 
         LinuxFileUtils.createDirectories(prometheusParams.dataDir(), user, group, Constants.PERMISSION_755, true);
 
-        return ShellResult.success("Prometheus Configure success!");
+        return ShellResult.success("Grafana Configure success!");
     }
 }
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
@@ -32,7 +32,6 @@
 import java.util.Properties;
 
 @AutoService(Script.class)
-@Slf4j
 public class PrometheusServerScript extends AbstractServerScript {
 
     @Override
@@ -55,7 +54,6 @@ 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) {