modify exporter

GiganticMinecraft · Dec 24, 2023 · 19e5f82 · 19e5f82
1 parent 06f20ca
commit 19e5f82
Showing 1 changed file with 11 additions and 28 deletions.
diff --git a/...-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/...-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml
@@ -30,18 +30,6 @@ spec:
                 values:
                 - seichi-onp-k8s-wk-1 # CPUの多いwk-1だけにスケジュールする
       initContainers:
-        - name: jmx-exporter-downloader
-          image: busybox:1.36.1
-          env:
-            - name: JMX_EXPORTER_URL
-              value: "https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar"
-          volumeMounts:
-            - name: jmx-exporter-download-volume
-              mountPath: /root/jmx-exporter-download
-          command:
-            - "sh"
-            - "-c"
-            - 'wget -O /root/jmx-exporter-download/jmx-exporter-javaagent.jar "${JMX_EXPORTER_URL}"'
         - name: mod-downloader
           image: ghcr.io/giganticminecraft/mod-downloader:sha-c0f7980
           env:
@@ -113,7 +101,8 @@ spec:
                 https://github.com/GiganticMinecraft/OriginSpawn/releases/download/v0.2.7/OriginSpawn-0.2.7-SNAPSHOT.jar,
                 https://github.com/GiganticMinecraft/StreamClock/releases/download/sha-dd1905c/StreamClock-1.0-SNAPSHOT.jdk17.jar,
                 https://github.com/GiganticMinecraft/ByeByeWither/releases/download/sha-e2a0a69/ByeByeWither-1.0.0.jar,
-
+                https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.5.0/minecraft-prometheus-exporter-2.5.0.jar,
+                https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar,
             - name: JVM_OPTS
               value: >-
                 -javaagent:/jmx-exporter/jmx-exporter-javaagent.jar=18321:/jmx-exporter/jmx-exporter-config.yaml
@@ -190,7 +179,6 @@ spec:
                 lp group default permission set clicktpa.tpaccept true
                 lp group default permission set clicktpa.tpahere true
                 lp group default permission set clicktpa.tptoggle true
-                
           image: ghcr.io/giganticminecraft/seichi_minecraft_server_debug_base_1_18_2:sha-1267b49
           name: minecraft
           ports:
@@ -199,12 +187,12 @@ spec:
             - containerPort: 18321
               name: jmx-metrics
 
-          # startupProbe:
-          #   tcpSocket:
-          #     port: 25565
-          #   # 最大180秒待つ
-          #   failureThreshold: 10
-          #   periodSeconds: 30
+          startupProbe:
+            tcpSocket:
+              port: 25565
+            # 最大120秒待つ
+            failureThreshold: 6
+            periodSeconds: 20
 
           readinessProbe:
             exec:
@@ -302,9 +290,6 @@ spec:
               subPath: config.yml
 
             # JMX exporter 周りのファイルが入ったボリューム達のマウント設定
-            - name: jmx-exporter-download-volume
-              mountPath: /jmx-exporter/jmx-exporter-javaagent.jar
-              subPath: jmx-exporter-javaagent.jar
             - name: common-jmx-exporter-config
               mountPath: /jmx-exporter/jmx-exporter-config.yaml
               subPath: jmx-exporter-config.yaml
@@ -337,17 +322,15 @@ spec:
           configMap:
             name: multiverse-portals-config
 
-        # JMX exporterをinitContainerでダウンロードしてBugneeCordに受け渡すためのvolume
-        - name: jmx-exporter-download-volume
-          emptyDir: {}
+        # JMX exporterのconfig volume
         - name: common-jmx-exporter-config
           configMap:
             name: common-jmx-exporter-config
 
-        # mod-downloaderからプラグインをinitContainerでダウンロードしてBugneeCordに受け渡すためのvolume
+        # mod-downloaderからプラグインをinitContainerでダウンロードしてMinecraftに受け渡すためのvolume
         - name: mod-downloader-volume
           emptyDir: {}
 
-        # # S1から取ってきたワールドデータをぶちこむボリューム
+        # # S1から取ってきたワールドデータをぶちこむvolume
         # - name: world-download-volume
         #   emptyDir: {}