Skip to content

Commit

Permalink
Merge pull request #27 from grafana/rename-chart
Browse files Browse the repository at this point in the history
Rename `grafana-agent` Helm chart to `alloy`
  • Loading branch information
rfratto authored Mar 12, 2024
2 parents a26828a + 756d285 commit 5e97fd3
Show file tree
Hide file tree
Showing 319 changed files with 5,828 additions and 6,627 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/helm-release.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:

# Note that this creates a release in grafana/helm-charts with a new tag.
# The tag name in grafana/helm-charts is <package>-<version>, while the
# tag name for grafana/agent is helm-chart/<version>.
# tag name for grafana/alloy is helm-chart/<version>.
- name: Make github release
uses: softprops/action-gh-release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Regenerate docs
run: |
docker run --rm \
-v "$(pwd)/operations/helm/charts/grafana-agent:/helm-docs" \
-v "$(pwd)/operations/helm/charts/alloy:/helm-docs" \
-u "$(id -u)" \
jnorwood/helm-docs
if ! git diff --exit-code; then
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ generate-helm-docs:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
cd operations/helm/charts/grafana-agent && helm-docs
cd operations/helm/charts/alloy && helm-docs
endif

generate-helm-tests:
Expand Down
8 changes: 4 additions & 4 deletions docs/sources/tasks/configure/configure-kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To configure {{< param "PRODUCT_NAME" >}} on Kubernetes, perform the following s
1. Run the following command in a terminal to upgrade your {{< param "PRODUCT_NAME" >}} installation:

```shell
helm upgrade RELEASE_NAME grafana/grafana-agent -f VALUES_PATH
helm upgrade RELEASE_NAME grafana/alloy -f VALUES_PATH
```

1. Replace `RELEASE_NAME` with the name you used for your {{< param "PRODUCT_NAME" >}} installation.
Expand All @@ -38,12 +38,12 @@ The following is an example snippet of a `kustomization` that disables this beha

```yaml
configMapGenerator:
- name: grafana-agent
- name: alloy
files:
- config.river
options:
disableNameSuffixHash: true
```
[values.yaml]: https://raw.githubusercontent.com/grafana/agent/main/operations/helm/charts/grafana-agent/values.yaml
[Helm chart]: https://github.com/grafana/agent/tree/main/operations/helm/charts/grafana-agent
[values.yaml]: https://raw.githubusercontent.com/grafana/alloy/main/operations/helm/charts/alloy/values.yaml
[Helm chart]: https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy
[Kustomize]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
2 changes: 1 addition & 1 deletion docs/sources/tasks/migrate/from-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ However, all static mode integrations have an equivalent component in the [`prom
The [reference documentation][component documentation] should help convert those integrations to their {{< param "PRODUCT_NAME" >}} equivalent.

<!-- ToDo: Validate path -->
[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/grafana-agent/values.yaml
[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml
[clustering]: ../../../concepts/clustering/
[deployment guide]: ../../../get-started/deploy-alloy
<!-- ToDo: check link syntax -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
// +groupName=monitoring.grafana.com

//go:generate controller-gen object paths=.
//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/grafana-agent/crds
//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/alloy/crds

package v1alpha2
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
// +genclient
// +kubebuilder:object:root=true
// +kubebuilder:resource:path="podlogs"
// +kubebuilder:resource:path="podlogs"
// +kubebuilder:resource:categories="grafana-agent"
// +kubebuilder:resource:categories="grafana-alloy"
// +kubebuilder:resource:categories="alloy"

// PodLogs defines how to collect logs for a Pod.
type PodLogs struct {
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docs generated by https://github.com/norwoodj/helm-docs
docs:
cd charts/grafana-agent && helm-docs
cd charts/alloy && helm-docs

rebuild-tests:
bash ./scripts/rebuild-tests.sh
4 changes: 2 additions & 2 deletions operations/helm/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Helm charts

This directory contains Helm charts for Grafana Agent.
This directory contains Helm charts for Grafana Alloy.

## Testing

Expand All @@ -11,7 +11,7 @@ correctness of the templates emitted by the Helm chart. To regenerate this
folder, call `make rebuild-tests` from the root of the repository.

`make generate-helm-tests` will iterate through the value.yaml files in
`charts/grafana-agent/ci` and generate each one as a separate directory under `charts/grafana-agent/tests`.
`charts/alloy/ci` and generate each one as a separate directory under `charts/alloy/tests`.

When modifying the Helm charts, `make rebuild-tests` must be run before
submitting a PR, as a linter check will ensure that this directory is
Expand Down
File renamed without changes.
17 changes: 17 additions & 0 deletions operations/helm/charts/alloy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Changelog

> _Contributors should read our [contributors guide][] for instructions on how
> to update the changelog._
This document contains a historical list of changes between releases. Only
changes that impact end-user behavior are listed; changes to documentation or
internal API changes are not present.

0.1.0 (2024-04-09)
------------------

### Features

- Introduce a Grafana Alloy Helm chart. The Grafana Alloy Helm chart is
backwards compatibile with the values.yaml from the `grafana-agent` Helm
chart. (@rfratto)
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
name: grafana-agent
description: 'Grafana Agent'
name: alloy
description: 'Grafana Alloy'
type: application
version: 0.36.0
appVersion: 'v0.40.2'
version: 0.1.0
appVersion: 'v1.0.0'

dependencies:
- name: crds
Expand Down
Loading

0 comments on commit 5e97fd3

Please sign in to comment.