Skip to content

Commit

Permalink
temporarily remove example/docker-compose
Browse files Browse the repository at this point in the history
exmaple/docker-compose was heavily written for static mode, and needs to
be recreated.
  • Loading branch information
rfratto committed Feb 29, 2024
1 parent b2676df commit 397a885
Show file tree
Hide file tree
Showing 18 changed files with 3 additions and 6,318 deletions.
20 changes: 1 addition & 19 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@ trigger:
type: docker
---
kind: pipeline
name: Test dashboards
platform:
arch: amd64
os: linux
steps:
- commands:
- make generate-dashboards
- ERR_MSG="Dashboard definitions are out of date. Please run 'make generate-dashboards'
and commit changes!"
- if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi
image: grafana/agent-build-image:0.32.0
name: Regenerate dashboards
trigger:
event:
- pull_request
type: docker
---
kind: pipeline
name: Test
platform:
arch: amd64
Expand Down Expand Up @@ -425,6 +407,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 9d5c94b8427eaa61069314281249efe1ba1c4a8a6d1c23e0088dff0c030d40a7
hmac: 118cf0f805912a99d8c268f18a179dbe69fa701fbf11f9a9effac933b63091e0

...
17 changes: 0 additions & 17 deletions .drone/pipelines/test.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@ local pipelines = import '../util/pipelines.jsonnet';
}],
},

pipelines.linux('Test dashboards') {
trigger: {
event: ['pull_request'],
},
steps: [{
name: 'Regenerate dashboards',
image: build_image.linux,

commands: [
'make generate-dashboards',
'ERR_MSG="Dashboard definitions are out of date. Please run \'make generate-dashboards\' and commit changes!"',
// "git status --porcelain" reports if there's any new, modified, or deleted files.
'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
],
}],
},

pipelines.linux('Test') {
trigger: {
event: ['pull_request'],
Expand Down
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
## generate-drone Generate the Drone YAML from Jsonnet.
## generate-helm-docs Generate Helm chart documentation.
## generate-helm-tests Generate Helm chart tests.
## generate-dashboards Generate dashboards in example/docker-compose after
## changing Jsonnet.
## generate-protos Generate protobuf files.
## generate-ui Generate the UI assets.
## generate-versioned-files Generate versioned files.
Expand Down Expand Up @@ -221,8 +219,8 @@ agent-boringcrypto-image:
# Targets for generating assets
#

.PHONY: generate generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files
generate: generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files generate-docs
.PHONY: generate generate-drone generate-helm-docs generate-helm-tests generate-protos generate-ui generate-versioned-files
generate: generate-drone generate-helm-docs generate-helm-tests generate-protos generate-ui generate-versioned-files generate-docs

generate-drone:
drone jsonnet -V BUILD_IMAGE_VERSION=$(BUILD_IMAGE_VERSION) --stream --format --source .drone/drone.jsonnet --target .drone/drone.yml
Expand All @@ -241,14 +239,6 @@ else
bash ./operations/helm/scripts/rebuild-tests.sh
endif

generate-dashboards:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
cd example/docker-compose && jb install && \
cd grafana/dashboards && jsonnet template.jsonnet -J ../../vendor -m .
endif

generate-protos:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
Expand Down
58 changes: 0 additions & 58 deletions example/docker-compose/README.md

This file was deleted.

155 changes: 0 additions & 155 deletions example/docker-compose/agent/config/agent.yaml

This file was deleted.

Loading

0 comments on commit 397a885

Please sign in to comment.