-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'grafana/main' into karsten/quantile-app…
…roximation
- Loading branch information
Showing
10 changed files
with
151 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| readonly account_name="${1-}" | ||
| readonly container_name="${2-}" | ||
|
|
||
| if [[ -z "${account_name}" ]]; then | ||
| echo "Provide a account name" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ -z "${container_name}" ]]; then | ||
| echo "Provide a container name" | ||
| exit 1 | ||
| fi | ||
|
|
||
| readonly namespace="${NAMESPACE:-openshift-logging}" | ||
|
|
||
| readonly azure_environment="AzureGlobal" | ||
|
|
||
| resource_group=$(az storage account show --name "${account_name}" | jq -r '.resourceGroup') | ||
| readonly resource_group | ||
|
|
||
| account_key=$(az storage account keys list --resource-group "${resource_group}" --account-name "${account_name}" | jq -r '.[0].value') | ||
| readonly account_key | ||
|
|
||
| kubectl --ignore-not-found=true -n "${namespace}" delete secret test | ||
| kubectl -n "${namespace}" create secret generic test \ | ||
| --from-literal=environment="$(echo -n "${azure_environment}")" \ | ||
| --from-literal=account_name="$(echo -n "${account_name}")" \ | ||
| --from-literal=account_key="$(echo -n "${account_key}")" \ | ||
| --from-literal=container="$(echo -n "${container_name}")" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| apiVersion: loki.grafana.com/v1 | ||
| kind: LokiStack | ||
| metadata: | ||
| name: lokistack-dev | ||
| namespace: openshift-logging | ||
| spec: | ||
| size: 1x.demo | ||
| storage: | ||
| schemas: | ||
| - version: v13 | ||
| effectiveDate: 2023-10-15 | ||
| secret: | ||
| name: test | ||
| type: azure | ||
| storageClassName: managed-csi | ||
| tenants: | ||
| mode: openshift-logging | ||
| rules: | ||
| enabled: true | ||
| selector: | ||
| matchLabels: | ||
| openshift.io/cluster-monitoring: "true" | ||
| namespaceSelector: | ||
| matchLabels: | ||
| openshift.io/cluster-monitoring: "true" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-lambda-go/events" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/grafana/loki/pkg/logproto" | ||
| ) | ||
|
|
||
| func Test_parseCWEvent(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| b *batch | ||
| expectedStream string | ||
| keepStream bool | ||
| }{ | ||
| { | ||
| name: "cloudwatch", | ||
| b: &batch{ | ||
| streams: map[string]*logproto.Stream{}, | ||
| }, | ||
| expectedStream: `{__aws_cloudwatch_log_group="testLogGroup", __aws_cloudwatch_owner="123456789123", __aws_log_type="cloudwatch"}`, | ||
| keepStream: false, | ||
| }, | ||
| { | ||
| name: "cloudwatch_keepStream", | ||
| b: &batch{ | ||
| streams: map[string]*logproto.Stream{}, | ||
| }, | ||
| expectedStream: `{__aws_cloudwatch_log_group="testLogGroup", __aws_cloudwatch_log_stream="testLogStream", __aws_cloudwatch_owner="123456789123", __aws_log_type="cloudwatch"}`, | ||
| keepStream: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| // Docs: https://docs.aws.amazon.com/lambda/latest/dg/services-cloudwatchlogs.html | ||
| // Example CloudWatchLogEvent copied from https://github.com/aws/aws-lambda-go/blob/main/events/cloudwatch_logs_test.go | ||
| cwevent := &events.CloudwatchLogsEvent{ | ||
| AWSLogs: events.CloudwatchLogsRawData{ | ||
| Data: "H4sIAAAAAAAAAHWPwQqCQBCGX0Xm7EFtK+smZBEUgXoLCdMhFtKV3akI8d0bLYmibvPPN3wz00CJxmQnTO41whwWQRIctmEcB6sQbFC3CjW3XW8kxpOpP+OC22d1Wml1qZkQGtoMsScxaczKN3plG8zlaHIta5KqWsozoTYw3/djzwhpLwivWFGHGpAFe7DL68JlBUk+l7KSN7tCOEJ4M3/qOI49vMHj+zCKdlFqLaU2ZHV2a4Ct/an0/ivdX8oYc1UVX860fQDQiMdxRQEAAA==", | ||
| }, | ||
| } | ||
|
|
||
| t.Run(tt.name, func(t *testing.T) { | ||
| batchSize = 131072 // Set large enough we don't send to promtail | ||
| keepStream = tt.keepStream | ||
| err := parseCWEvent(context.Background(), tt.b, cwevent) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| require.Len(t, tt.b.streams, 1) | ||
| stream, ok := tt.b.streams[tt.expectedStream] | ||
| require.True(t, ok, "batch does not contain stream: %s", tt.expectedStream) | ||
| require.NotNil(t, stream) | ||
| }) | ||
| } | ||
| } |