chore(monitor): remove telegraf

Author: duanhongyi

.gitignore

@@ -2,8 +2,3 @@
 *.swp
 *.swo
 .DS_Store
-
-telegraf/manifests/*.tmp.yaml
-chronograf/manifests/*.tmp.yaml
-grafana/manifests/*.tmp.yaml
-rootfs/usr/bin/telegraf

.woodpecker/build-linux.yml

@@ -13,8 +13,7 @@ steps:
   commands:
   - echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - export VERSION=$([ -z $CI_COMMIT_TAG ] && echo latest || echo $CI_COMMIT_TAG)-$(sed 's#/#-#g' <<< $CI_SYSTEM_PLATFORM)
-  - cd grafana && make build-all push-all && cd ..
-  - cd telegraf && make build-all push-all && cd ..
+  - make podman-build podman-push
   secrets:
   - codename
   - dev_registry

.woodpecker/chart.yaml

@@ -25,5 +25,4 @@ steps:
     - tag
 
 depends_on:
-- manifest-grafana
-- manifest-telegraf
+- manifest

.woodpecker/manifest-telegraf.yml

@@ -6,7 +6,7 @@ steps:
 - name: generate-manifest
   image: bash
   commands:
-  - sed -i "s/{{project}}/grafana/g" .woodpecker/manifest.tmpl
+  - sed -i "s/{{project}}/$${CI_REPO_NAME}/g" .woodpecker/manifest.tmpl
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest.tmpl
   secrets:
   - drycc_registry

.woodpecker/manifest-grafana.yml .woodpecker/manifest.yml.woodpecker/manifest-grafana.yml renamed to .woodpecker/manifest.yml

@@ -11,8 +11,7 @@ steps:
 - name: test-linux
   image: bash
   commands:
-  - cd grafana && make test && cd ..
-  - cd telegraf && make test && cd ..
+  - make test
   secrets:
   - codename
   - dev_registry

.woodpecker/test-linux.yml

@@ -1,14 +1,16 @@
 SHELL := /bin/bash
 
-# all monitor components share/use the following targets/exports
+# grafana share/use the following targets/exports
+SHORT_NAME ?= grafana
+SHELL_SCRIPTS = rootfs/usr/share/grafana/start-grafana
+
 BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 IMAGE_PREFIX ?= drycc
 PLATFORM ?= linux/amd64,linux/arm64
 
-include ../includes.mk
-include ../versioning.mk
-include ../deploy.mk
+include includes.mk
+include versioning.mk
 
 TEST_ENV_PREFIX := podman run --rm -v ${CURDIR}:/bash -w /bash ${DEV_REGISTRY}/drycc/go-dev
 
@@ -33,10 +35,3 @@ test-style:
 
 .PHONY: build push podman-build clean upgrade deploy test test-style
 
-build-all:
-	podman build --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
-	podman build --build-arg CODENAME=${CODENAME} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
-
-push-all:
-	podman push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION}
-	podman push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION}

default.mk Makefiledefault.mk renamed to Makefile

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: oci://registry.drycc.cc/charts
+  version: 1.1.3
+digest: sha256:4928b76b9f4927f43702c2617b139b2fe7298055b9b6d0c363a7a94530985595
+generated: "2024-11-18T16:21:05.150712088+08:00"

README.md

@@ -1,12 +1,12 @@
-name: monitor
-home: https://github.com/drycc/monitor
+name: grafana
+home: https://github.com/drycc/grafana
 apiVersion: v2
 appVersion: 1.0.0
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
     version: ~1.1.2
-description: Monitoring for Drycc Workflow.
+description: Grafana for Drycc Workflow.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com