Merge branch 'main' into feat/aliyun-repo

Signed-off-by: linuzb <[email protected]>
alipay · Jun 18, 2024 · 197d2e1 · 197d2e1
2 parents 3d3c595 + dee688d
commit 197d2e1
Show file tree

Hide file tree

Showing 52 changed files with 19,589 additions and 28 deletions.
diff --git a/build/docker/Dockerfile.grafana b/build/docker/Dockerfile.grafana
@@ -4,7 +4,14 @@ FROM node as node
 COPY ./grafana_plugin/yaml_panel /app/yaml_panel
 # 在镜像中创建工作目录
 WORKDIR /app/yaml_panel
+# 安装依赖并编译
+RUN npm install \
+    && npm run build
 
+# 将filter panel代码拷贝到镜像中的工作目录
+COPY ./grafana_plugin/filter_panel /app/filter_panel
+# 在镜像中创建工作目录
+WORKDIR /app/filter_panel
 # 安装依赖并编译
 RUN npm install \
     && npm run build
@@ -13,6 +20,7 @@ RUN npm install \
 FROM grafana/grafana:10.4.2-ubuntu
 
 COPY --from=node /app/yaml_panel/dist /var/lib/grafana/plugins/antgroup-yaml-panel
+COPY --from=node /app/filter_panel/dist /var/lib/grafana/plugins/antgroup-filter-panel
 
 # Define the list of plugins to install, separated by spaces.
 ARG PLUGINS="" 

diff --git a/cmd/grafanadi/main.go b/cmd/grafanadi/main.go
@@ -10,6 +10,7 @@ import (
 	"github.com/alipay/container-observability-service/pkg/utils"
 
 	"github.com/alipay/container-observability-service/internal/grafanadi/server"
+	"github.com/alipay/container-observability-service/internal/grafanadi/service"
 	"github.com/alipay/container-observability-service/pkg/dal/storage-client/data_access"
 	"github.com/spf13/cobra"
 	pflag "github.com/spf13/pflag"
@@ -68,6 +69,7 @@ func newRootCmd() *cobra.Command {
 
 	// for storage
 	cmd.PersistentFlags().StringVarP(&cfgFile, "config-file", "", "/app/storage-config.yaml", "storage config file")
+	cmd.PersistentFlags().StringVarP(&service.GrafanaUrl, "grafana-url", "", "", "grafana url")
 
 	// kubeconfig for k8s client
 	cmd.PersistentFlags().StringVarP(&kubeConfigFile, "kubeconfig", "", "/etc/kubernetes/kubeconfig/admin.kubeconfig", "Path to kubeconfig file with authorization and apiserver information.")