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

feat(tempo): Update and migrate Grafana Tempo #726

Merged
merged 26 commits into from
Jul 11, 2023
Merged

feat(tempo): Update and migrate Grafana Tempo #726

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5e8d61c
init
davidspek Jun 19, 2023
fe53144
some small cleanups
davidspek Jun 19, 2023
9ff0792
tmp
davidspek Jun 19, 2023
33c8e6f
init push to plural for testing
davidspek Jun 19, 2023
fe521b5
init somewhat working azure
davidspek Jun 19, 2023
987d9b4
init add datasource configs for trace shield
davidspek Jun 19, 2023
5da02b7
add metrics generator config
davidspek Jun 19, 2023
450aa46
init traces working through trace shield
davidspek Jun 19, 2023
bbe698b
cleanup nginx tracing setup
davidspek Jun 19, 2023
3d9b9dd
add tracing for trace shield components
davidspek Jun 19, 2023
f519c05
some small fixes
davidspek Jun 19, 2023
045d0c9
vendor grafana-agent images
davidspek Jun 19, 2023
0c97050
fix grafana agent image value
davidspek Jun 19, 2023
950caac
configure observability stack with traces
davidspek Jul 3, 2023
97d8d5f
init add resources
davidspek Jul 3, 2023
95d250a
progress
davidspek Jul 4, 2023
5315331
bump trace shield version
davidspek Jul 10, 2023
692bfe6
only enable agents as needed
davidspek Jul 10, 2023
5f544d6
fix: remove some templating bugs
davidspek Jul 10, 2023
06e2c5f
fix: bump charts for merging
davidspek Jul 10, 2023
d380956
some last small fixes
davidspek Jul 10, 2023
358d8b3
cleanup(tempo): simplify grafana-agent in template
davidspek Jul 10, 2023
8e62218
cleanup: remove old tags
davidspek Jul 10, 2023
9e9b427
update repository
davidspek Jul 10, 2023
5d8aac2
fix: add default relabels for podLogs
davidspek Jul 10, 2023
74f1adb
fix: add tempo helm dep
davidspek Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions grafana-agent/helm/grafana-agent-operator/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: grafana-agent-operator
repository: https://grafana.github.io/helm-charts
version: 0.2.14
digest: sha256:652985c46f1a8275943ab9b55d454241fd9b4c2f542208e8b55004db75ac25e6
generated: "2023-03-28T19:24:33.697724+02:00"
version: 0.2.16
digest: sha256:ae7cade8886c204e6683d49cf7922bf2bf17dc68fbcda7a09c007fd419934d24
generated: "2023-07-10T14:21:28.897944+02:00"
6 changes: 3 additions & 3 deletions grafana-agent/helm/grafana-agent-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v2
name: grafana-agent-operator
description: helm chart for grafana-agent-operator
type: application
version: 0.1.1
appVersion: v0.32.1
version: 0.1.2
appVersion: v0.34.3
dependencies:
- name: grafana-agent-operator
version: 0.2.14
version: 0.2.16
repository: https://grafana.github.io/helm-charts
condition: grafana-agent-operator.enabled
Binary file removed grafana-agent/helm/grafana-agent-operator/charts/grafana-agent-operator-0.2.14.tgz
View file
Open in desktop
Binary file not shown.
Binary file added grafana-agent/helm/grafana-agent-operator/charts/grafana-agent-operator-0.2.16.tgz
View file
Open in desktop
Binary file not shown.
447 changes: 370 additions & 77 deletions grafana-agent/helm/grafana-agent-operator/crds/monitoring.grafana.com_grafanaagents.yaml
View file
Open in desktop

Large diffs are not rendered by default.

89 changes: 67 additions & 22 deletions grafana-agent/helm/grafana-agent-operator/crds/monitoring.grafana.com_integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,12 @@ spec:
provisioner or an external controller can support
the specified data source, it will create a new
volume based on the contents of the specified
data source. If the AnyVolumeDataSource feature
gate is enabled, this field will always have the
same contents as the DataSourceRef field.'
data source. When the AnyVolumeDataSource feature
gate is enabled, dataSource contents will be copied
to dataSourceRef, and dataSourceRef contents will
be copied to dataSource when dataSourceRef.namespace
is not specified. If the namespace is specified,
then dataSourceRef will not be copied to dataSource.'
properties:
apiGroup:
description: APIGroup is the group for the resource
Expand All @@ -652,27 +655,35 @@ spec:
description: 'dataSourceRef specifies the object
from which to populate the volume with data, if
a non-empty volume is desired. This may be any
local object from a non-empty API group (non core
object) or a PersistentVolumeClaim object. When
this field is specified, volume binding will only
succeed if the type of the specified object matches
some installed volume populator or dynamic provisioner.
object from a non-empty API group (non core object)
or a PersistentVolumeClaim object. When this field
is specified, volume binding will only succeed
if the type of the specified object matches some
installed volume populator or dynamic provisioner.
This field will replace the functionality of the
DataSource field and as such if both fields are
dataSource field and as such if both fields are
non-empty, they must have the same value. For
backwards compatibility, both fields (DataSource
and DataSourceRef) will be set to the same value
backwards compatibility, when namespace isn''t
specified in dataSourceRef, both fields (dataSource
and dataSourceRef) will be set to the same value
automatically if one of them is empty and the
other is non-empty. There are two important differences
between DataSource and DataSourceRef: * While
DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef
preserves all values, and generates an error if
a disallowed value is specified. (Beta) Using
this field requires the AnyVolumeDataSource feature
gate to be enabled.'
other is non-empty. When namespace is specified
in dataSourceRef, dataSource isn''t set to the
same value and must be empty. There are three
important differences between dataSource and dataSourceRef:
* While dataSource only allows two specific types
of objects, dataSourceRef allows any non-core
object, as well as PersistentVolumeClaim objects.
* While dataSource ignores disallowed values (dropping
them), dataSourceRef preserves all values, and
generates an error if a disallowed value is specified.
* While dataSource only allows local objects,
dataSourceRef allows objects in any namespaces.
(Beta) Using this field requires the AnyVolumeDataSource
feature gate to be enabled. (Alpha) Using the
namespace field of dataSourceRef requires the
CrossNamespaceVolumeDataSource feature gate to
be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource
Expand All @@ -689,11 +700,21 @@ spec:
description: Name is the name of resource being
referenced
type: string
namespace:
description: Namespace is the namespace of resource
being referenced Note that when a namespace
is specified, a gateway.networking.k8s.io/ReferenceGrant
object is required in the referent namespace
to allow that namespace's owner to accept
the reference. See the ReferenceGrant documentation
for details. (Alpha) This field requires the
CrossNamespaceVolumeDataSource feature gate
to be enabled.
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
description: 'resources represents the minimum resources
the volume should have. If RecoverVolumeExpansionFailure
Expand All @@ -702,6 +723,30 @@ spec:
value but must still be higher than capacity recorded
in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
properties:
claims:
description: "Claims lists the names of resources,
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field
and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
items:
description: ResourceClaim references one
entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name
of one entry in pod.spec.resourceClaims
of the Pod where this field is used.
It makes that resource available inside
a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down
86 changes: 86 additions & 0 deletions grafana-agent/helm/grafana-agent-operator/crds/monitoring.grafana.com_logsinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,92 @@ spec:
description: ExternalLabels are labels to add to any time series
when sending data to Loki.
type: object
oauth2:
description: Oauth2 for URL
properties:
clientId:
description: The secret or configmap containing the OAuth2
client id
properties:
configMap:
description: ConfigMap containing data to use for the
targets.
properties:
key:
description: The key to select.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind,
uid?'
type: string
optional:
description: Specify whether the ConfigMap or its
key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
secret:
description: Secret containing data to use for the targets.
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind,
uid?'
type: string
optional:
description: Specify whether the Secret or its key
must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
clientSecret:
description: The secret containing the OAuth2 client secret
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must
be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
type: object
scopes:
description: OAuth2 scopes used for the token request
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
minLength: 1
type: string
required:
- clientId
- clientSecret
- tokenUrl
type: object
proxyUrl:
description: ProxyURL to proxy requests through. Optional.
type: string
Expand Down
5 changes: 5 additions & 0 deletions grafana-agent/helm/grafana-agent-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
grafana-agent-operator:
image:
registry: dkr.plural.sh
repository: grafana-agent/grafana/agent-operator
tag: v0.34.3
9 changes: 6 additions & 3 deletions grafana-agent/helm/grafana-agent/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
dependencies:
- name: grafana-agent
repository: https://grafana.github.io/helm-charts
version: 0.10.0
digest: sha256:3b41e6546feb16fb80322aa4925e746ac251f5ab2d84e8f0e5c908df319c5021
generated: "2023-03-28T19:24:50.521787+02:00"
version: 0.16.0
- name: grafana-agent
repository: https://grafana.github.io/helm-charts
version: 0.16.0
digest: sha256:734095ac01709cd7ddbfddd4e740af67cecc2ff6c14cc5d3da2585bec5e7f434
generated: "2023-07-10T14:23:30.603091+02:00"
8 changes: 4 additions & 4 deletions grafana-agent/helm/grafana-agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ apiVersion: v2
name: grafana-agent
description: helm chart for grafana-agent
type: application
version: 0.1.2
appVersion: v0.32.1
version: 0.1.3
appVersion: v0.34.3
dependencies:
- name: grafana-agent
version: 0.10.0
version: 0.16.0
repository: https://grafana.github.io/helm-charts
alias: traces
condition: traces.enabled
- name: grafana-agent
version: 0.10.0
version: 0.16.0
repository: https://grafana.github.io/helm-charts
alias: logs
condition: logs.enabled
Binary file removed grafana-agent/helm/grafana-agent/charts/grafana-agent-0.10.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added grafana-agent/helm/grafana-agent/charts/grafana-agent-0.16.0.tgz
View file
Open in desktop
Binary file not shown.
Loading