Skip to content

Commit a47b1bc

Browse files
committed
Merge branch 'sync-github' into 'main'
Sync github See merge request observability-bd-projects/one-observability-demo!124
2 parents 159e175 + 1e263f5 commit a47b1bc

18 files changed

+15112
-251
lines changed

PetAdoptions/payforadoption-go/go.mod

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,21 @@ module petadoptions
33
go 1.15
44

55
require (
6-
github.com/aws/aws-sdk-go v1.43.37
7-
github.com/aws/aws-xray-sdk-go v1.7.0
8-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
9-
github.com/dghubble/sling v1.4.0
6+
github.com/aws/aws-sdk-go v1.44.273
7+
github.com/aws/aws-xray-sdk-go v1.8.1
8+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
9+
github.com/dghubble/sling v1.4.1
1010
github.com/go-kit/kit v0.12.0
11-
github.com/gofrs/uuid v4.2.0+incompatible
11+
github.com/go-logfmt/logfmt v0.6.0 // indirect
12+
github.com/gofrs/uuid v4.4.0+incompatible
1213
github.com/gorilla/mux v1.8.0
13-
github.com/guregu/dynamo v1.15.0
14-
github.com/klauspost/compress v1.15.1 // indirect
15-
github.com/lib/pq v1.10.5
16-
github.com/magiconair/properties v1.8.6 // indirect
17-
github.com/prometheus/client_golang v1.12.1
18-
github.com/prometheus/common v0.33.0 // indirect
19-
github.com/spf13/afero v1.8.2 // indirect
20-
github.com/spf13/viper v1.10.1
21-
github.com/valyala/fasthttp v1.35.0 // indirect
22-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
23-
golang.org/x/sys v0.0.0-20220412071739-889880a91fd5 // indirect
24-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
25-
gopkg.in/ini.v1 v1.66.4 // indirect
14+
github.com/guregu/dynamo v1.19.0
15+
github.com/klauspost/compress v1.16.5 // indirect
16+
github.com/lib/pq v1.10.9
17+
github.com/prometheus/client_golang v1.15.1
18+
github.com/prometheus/common v0.44.0 // indirect
19+
github.com/prometheus/procfs v0.10.1 // indirect
20+
github.com/spf13/viper v1.16.0
21+
github.com/valyala/fasthttp v1.47.0 // indirect
22+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
2623
)

PetAdoptions/payforadoption-go/go.sum

Lines changed: 1034 additions & 87 deletions
Large diffs are not rendered by default.

PetAdoptions/petlistadoptions-go/go.mod

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,26 @@ module petadoptions
33
go 1.15
44

55
require (
6-
github.com/aws/aws-sdk-go v1.43.37
7-
github.com/aws/aws-xray-sdk-go v1.7.0
8-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
6+
github.com/aws/aws-sdk-go v1.44.273
7+
github.com/aws/aws-xray-sdk-go v1.8.1
98
github.com/go-kit/kit v0.12.0
9+
github.com/go-logfmt/logfmt v0.6.0 // indirect
1010
github.com/gorilla/mux v1.8.0
11-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 // indirect
12-
github.com/klauspost/compress v1.15.1 // indirect
13-
github.com/lib/pq v1.10.5
14-
github.com/magiconair/properties v1.8.6 // indirect
15-
github.com/prometheus/client_golang v1.12.1
16-
github.com/prometheus/common v0.33.0 // indirect
17-
github.com/spf13/afero v1.8.2 // indirect
18-
github.com/spf13/viper v1.10.1
19-
github.com/valyala/fasthttp v1.35.0 // indirect
20-
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.31.0
21-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0
22-
go.opentelemetry.io/contrib/propagators/aws v1.6.0
23-
go.opentelemetry.io/otel v1.6.3
24-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.3
25-
go.opentelemetry.io/otel/metric v0.29.0 // indirect
26-
go.opentelemetry.io/otel/sdk v1.6.3
27-
go.opentelemetry.io/otel/trace v1.6.3
28-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
29-
golang.org/x/sys v0.0.0-20220412071739-889880a91fd5 // indirect
30-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
31-
google.golang.org/grpc v1.45.0
32-
gopkg.in/ini.v1 v1.66.4 // indirect
11+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
12+
github.com/klauspost/compress v1.16.5 // indirect
13+
github.com/lib/pq v1.10.9
14+
github.com/prometheus/client_golang v1.15.1
15+
github.com/prometheus/common v0.44.0 // indirect
16+
github.com/prometheus/procfs v0.10.1 // indirect
17+
github.com/spf13/viper v1.16.0
18+
github.com/valyala/fasthttp v1.47.0 // indirect
19+
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.42.0
20+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
21+
go.opentelemetry.io/contrib/propagators/aws v1.17.0
22+
go.opentelemetry.io/otel v1.16.0
23+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
24+
go.opentelemetry.io/otel/sdk v1.16.0
25+
go.opentelemetry.io/otel/trace v1.16.0
26+
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
27+
google.golang.org/grpc v1.55.0
3328
)

PetAdoptions/petlistadoptions-go/go.sum

Lines changed: 1058 additions & 121 deletions
Large diffs are not rendered by default.

gitops/git-repository.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: source.toolkit.fluxcd.io/v1beta2
2+
kind: GitRepository
3+
metadata:
4+
name: grafana-repo
5+
namespace: flux-system
6+
spec:
7+
interval: 5m0s
8+
url: https://github.com/aws-samples/one-observability-demo
9+
ref:
10+
branch: main

gitops/grafana-kustomization.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
2+
kind: Kustomization
3+
metadata:
4+
name: grafana-kustomization
5+
namespace: flux-system
6+
spec:
7+
interval: 1m0s
8+
path: ./grafana-operator-manifests
9+
prune: true
10+
sourceRef:
11+
kind: GitRepository
12+
name: grafana-repo
13+
postBuild:
14+
substituteFrom:
15+
- kind: ConfigMap
16+
name: cluster-vars

0 commit comments

Comments
 (0)