Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alloy Metric Module Imports #543

Merged
merged 14 commits into from
Jun 8, 2024
Merged

Alloy Metric Module Imports #543

merged 14 commits into from
Jun 8, 2024

Conversation

bentonam
Copy link
Collaborator

No description provided.

@bentonam bentonam requested a review from petewall May 21, 2024 21:16
nightfall-for-github[bot]
nightfall-for-github bot reviewed May 22, 2024
View reviewed changes
examples/metric-module-imports/output.yaml
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bentonam Hi, we noticed you made a commit in GitHub that may contain sensitive information (details below). Please double check if you intended to include or share this sensitive information in the issue.

Note that it may have already been addressed automatically by an administrator.

What types of sensitive information were detected?
API Key: Google API

What was the context?

7: value: "AI******************…" - name:

When did this happen?
Tue, 21 May 2024 at 21:26:26 UTC

Where did this happen?
Repository: k8s-monitoring-helm
File Path: examples/metric-module-imports/output.yaml

What can I do now?
Please review the incident details carefully and help us remediate with these actions
Report as False Positive
Provide Business Justification

@bentonam
Added Loki Metrics to Allow List (#535)
8421151 
* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs
petewall
petewall reviewed May 28, 2024
View reviewed changes
Copy link
Collaborator

@petewall petewall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love making modules become a first-class citizen.
I want to take some time to properly review and test this, so it'll likely be next week when I get around to it.

github-actions bot and others added 4 commits May 28, 2024 16:45
@github-actions
Update Grafana Alloy (#546)
7500956 
Signed-off-by: Pete Wall <pete.wall@grafana.com>
@petewall
Always call tpl outside of with blocks to preserve backwards compatib…
d9efcb6 
…ility (#554)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
@bentonam
Added schema
9d28813
@bentonam
Renamed modules.alias to modules.name
0ec175d
petewall
petewall approved these changes Jun 6, 2024
View reviewed changes
Copy link
Collaborator

@petewall petewall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is looking good.
Is there a doc in alloy_modules that describes the convention that we're starting to enforce here?

bentonam and others added 7 commits June 6, 2024 16:43
@bentonam @github-actions
Added Support for Journal Logs (#545)
825c504 
* Added Support for Journal Logs

Resolves #544

* Fixed formatting

* Added Loki Metrics to Allow List (#535)

* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs

* Added Support for Journal Logs

Resolves #544

* Added CI Test

* Fixed Formatting

* Updated Test Queries

* Regenerated Documentation

* Removed Journal from Test

Kind nodes do not have systemd

* Update Grafana Alloy (#546)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Added Support for Journal Logs

Resolves #544

* Revert "Updated Test Queries"

This reverts commit 8de520c.

* Regenerated

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@bentonam
Added Support for Alloy Module Imports
b4179cb 
Resolves #537
@bentonam
Added extraConfig Import Example
4c313d5
@bentonam
Added schema
7026864
@bentonam
Renamed modules.alias to modules.name
d42fd86
@bentonam
Generated Outputs
d7bbea8
@bentonam
Merge branch 'feat/metric-modules' of github.com:grafana/k8s-monitori…
2d1596f 
…ng-helm into feat/metric-modules

# Conflicts:
#	examples/metric-module-imports-extra-config/output.yaml
#	examples/metric-module-imports/output.yaml
@bentonam
Copy link
Collaborator Author

bentonam commented Jun 7, 2024

I think this is looking good. Is there a doc in alloy_modules that describes the convention that we're starting to enforce here?

@petewall I don't think the is a doc that officially describes it, the convention is implemented in the majority of metric modules after some discussions with multiple people from different teams. It's hard to say if we should create one or not, because it's not like a model "has to" implement that, but for use within the helm chart we need to have consistency. If a user doesn't want that, they can still do it through the extraConfig.

I updated the module.alias to module.name, merged in changes from main and updated the values.schema.json. Do you want to review before merging?

@bentonam bentonam merged commit f9ca394 into main Jun 8, 2024
16 checks passed
@bentonam bentonam deleted the feat/metric-modules branch June 8, 2024 03:34
bentonam added a commit that referenced this pull request Jun 8, 2024
@bentonam @github-actions @petewall
Alloy Metric Module Imports (#543)
ead04cc 
* Added Support for Alloy Module Imports

Resolves #537

* Added extraConfig Import Example

* Added Loki Metrics to Allow List (#535)

* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs

* Update Grafana Alloy (#546)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Always call tpl outside of with blocks to preserve backwards compatibility (#554)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Added schema

* Renamed modules.alias to modules.name

* Added Support for Journal Logs (#545)

* Added Support for Journal Logs

Resolves #544

* Fixed formatting

* Added Loki Metrics to Allow List (#535)

* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs

* Added Support for Journal Logs

Resolves #544

* Added CI Test

* Fixed Formatting

* Updated Test Queries

* Regenerated Documentation

* Removed Journal from Test

Kind nodes do not have systemd

* Update Grafana Alloy (#546)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Added Support for Journal Logs

Resolves #544

* Revert "Updated Test Queries"

This reverts commit 8de520c.

* Regenerated

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added Support for Alloy Module Imports

Resolves #537

* Added extraConfig Import Example

* Added schema

* Renamed modules.alias to modules.name

* Generated Outputs

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Pete Wall <pete.wall@grafana.com>
bentonam added a commit that referenced this pull request Jun 11, 2024
@bentonam @github-actions @petewall
Dynamic External Labels (#552)
82ee07f 
* Fixed alloy run Lint Issue

* Added support for externalLabelsDynamic

* Renamed externalLabelsDynamic to externalLabelsFrom

* Update Grafana Alloy (#549)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Update Kube State Metrics (#551)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Update Prometheus Operator CRDs (#548)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: petewall <petewall@users.noreply.github.com>

* Bump version to 1.0.13

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Alloy Metric Module Imports (#543)

* Added Support for Alloy Module Imports

Resolves #537

* Added extraConfig Import Example

* Added Loki Metrics to Allow List (#535)

* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs

* Update Grafana Alloy (#546)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Always call tpl outside of with blocks to preserve backwards compatibility (#554)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Added schema

* Renamed modules.alias to modules.name

* Added Support for Journal Logs (#545)

* Added Support for Journal Logs

Resolves #544

* Fixed formatting

* Added Loki Metrics to Allow List (#535)

* Added Loki Metrics to Allow List

* Regenerated Output

* Regenerated Docs

* Added Support for Journal Logs

Resolves #544

* Added CI Test

* Fixed Formatting

* Updated Test Queries

* Regenerated Documentation

* Removed Journal from Test

Kind nodes do not have systemd

* Update Grafana Alloy (#546)

Signed-off-by: Pete Wall <pete.wall@grafana.com>

* Added Support for Journal Logs

Resolves #544

* Revert "Updated Test Queries"

This reverts commit 8de520c.

* Regenerated

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added Support for Alloy Module Imports

Resolves #537

* Added extraConfig Import Example

* Added schema

* Renamed modules.alias to modules.name

* Generated Outputs

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Pete Wall <pete.wall@grafana.com>

* Regenerated Output

* Updated README.md values.yaml reference

* Regenerated Output

* Added externalLabelsFrom CI Test

* Corrected Operator

---------

Signed-off-by: Pete Wall <pete.wall@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: petewall <petewall@users.noreply.github.com>
Co-authored-by: Pete Wall <pete.wall@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nightfall-for-github Nightfall for GitHub Nightfall for GitHub left review comments

@petewall petewall petewall approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bentonam @petewall