chore: update github actions

chore: update building workflow

.github/workflows/release.yaml

@@ -12,17 +12,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go Environment
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
+        uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Chart.yaml

@@ -25,11 +25,11 @@ keywords:
   - logs
 home: https://n9e.github.io
 sources: 
-  - https://github.com/didi/nightingale
+  - https://github.com/ccfos/nightingale
 maintainers:
 - email: contact-us@flashcat.cloud
   name: flashcatcloud
-version: 0.2.7
+version: 0.2.8
 apiVersion: v1
-appVersion: 6.3.4
+appVersion: 7.0.0
 icon: https://raw.githubusercontent.com/flashcatcloud/n9e-helm/master/n9e-icon.png

templates/_helpers.tpl

@@ -160,6 +160,18 @@ app: "{{ template "nightingale.name" . }}"
     {{- printf "80" -}}
 {{- end -}}
 
+{{- define "nightingale.n9e.ibexPort" -}}
+  {{- if eq .Values.n9e.type "internal" -}}
+    {{- printf "%s" "20090" -}}
+  {{- else -}}
+    {{- .Values.n9e.external.ibexPort -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "nightingale.n9e.ibexServicePort" -}}
+    {{- printf "20090" -}}
+{{- end -}}
+
 {{- define "nightingale.prometheus.host" -}}
   {{- if eq .Values.prometheus.type "internal" -}}
     {{- template "nightingale.prometheus" . }}

templates/n9e/conf-cm.yaml

@@ -60,8 +60,6 @@ data:
     user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
     [HTTP.JWTAuth]
-    # signing key
-    SigningKey = "5b94a0fd640fe2765af826acfe42d151"
     # unit: min
     AccessExpired = 1500
     # unit: min
@@ -86,12 +84,11 @@ data:
     MaxLifetime = 7200
     MaxOpenConns = 150
     MaxIdleConns = 50
-    TablePrefix = ""
 
     [Redis]
     Address = "{{ template "nightingale.redis.addr" . }}"
     Password = "{{ template "nightingale.redis.password" . }}"
-    RedisType = "{{ template "nightingale.redis.mode"}}"
+    RedisType = "{{ template "nightingale.redis.mode" . }}"
 
     [Alert]
     [Alert.Heartbeat]
@@ -99,7 +96,7 @@ data:
     IP = ""
     # unit ms
     Interval = 1000
-    ClusterName = "default"
+    EngineName = "default"
 
     [Center]
     MetricsYamlFile = "/app/etc/metrics.yaml"
@@ -112,6 +109,7 @@ data:
     [Pushgw]
     # use target labels in database instead of in series
     LabelRewrite = true
+    ForceUseServerTS = true
 
     [[Pushgw.Writers]]
     Url = "http://{{ template "nightingale.prometheus.host" . }}:{{ template "nightingale.prometheus.servicePort" . }}/api/v1/write"
@@ -131,4 +129,7 @@ data:
     MaxConnsPerHost = 0
     MaxIdleConns = 100
     MaxIdleConnsPerHost = 100
+    [Ibex]
+    Enable = false
+    RPCListen = "0.0.0.0:{{ template "nightingale.n9e.ibexPort" . }}"
 {{- end -}}

templates/n9e/deployment.yaml

@@ -57,14 +57,12 @@ spec:
           ports:
             - containerPort: {{ template "nightingale.n9e.port" . }}
 {{- if .Values.n9e.internal.resources }}
-        resources:
-{{ toYaml .Values.n9e.internal.resources | indent 10 }}
+          resources:
+{{ toYaml .Values.n9e.internal.resources | indent 12 }}
 {{- end }}
           volumeMounts:
             - mountPath: /app/etc
               name: n9e-config
-            - mountPath: /app/etc/template
-              name: n9e-template
             - mountPath: /app/etc/script
               name: n9e-script
       # hostname: n9e
@@ -73,9 +71,6 @@ spec:
         - name: n9e-config
           configMap:
             name: n9e-config
-        - name: n9e-template
-          configMap:
-            name: n9e-template
         - name: n9e-script
           configMap:
             name: n9e-script

templates/n9e/service.yaml

@@ -26,6 +26,9 @@ spec:
     - name: "port"
       port: {{ template "nightingale.n9e.servicePort" . }}
       targetPort: {{ template "nightingale.n9e.port" . }}
+    - name: "ibex"
+      port: {{ template "nightingale.n9e.ibexServicePort" . }}
+      targetPort: {{ template "nightingale.n9e.ibexPort" . }}
   selector:
 {{ include "nightingale.matchLabels" . | indent 4 }}
     component: center

templates/n9e/tpl-cm.yaml

@@ -1,24 +0,0 @@
-{{/*
-# Copyright 2022 flashcat.cloud | 快猫星云
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-*/}}
-{{- if eq .Values.n9e.type "internal" -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: n9e-template
-data:
-{{ (.Files.Glob "tpl/*.tpl").AsConfig | indent 2 }}
-{{- end -}}

templates/prometheus/configmap.yaml

@@ -24,7 +24,7 @@ data:
     [
       {
         "targets": [
-          "n9e: {{ template  "nightingale.n9e.servicePort" . }}"
+          "nightingale-center:{{ template  "nightingale.n9e.servicePort" . }}"
         ]
       }
     ]

values.yaml

@@ -216,7 +216,7 @@ n9e:
     automountServiceAccountToken: false
     image:
       repository: flashcatcloud/nightingale
-      tag: 6.3.4
+      tag: 7.0.0
     resources: {}
     #  requests:
     #    memory: 512Mi