Skip to content

Commit

Permalink
chore: update all dependencies except for grafana-plugin-sdk-go
Browse files Browse the repository at this point in the history
  • Loading branch information
amlmtl committed Mar 7, 2024
1 parent dee4ea9 commit 826c198
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 142 deletions.
38 changes: 38 additions & 0 deletions docker/dev/config/kc3_config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
app_mode = development
instance_name = grafana-oss

[plugins]
enable_alpha = true
app_tls_skip_verify_insecure = false
allow_loading_unsigned_plugins = sasesp-plugin

[server]
root_url = http://localhost:3000
serve_from_sub_path = true

[auth]
signout_redirect_url = https://d19417.ingress-nginx.kc3-m1.esm.sashq-d.openstack.sas.com/SASLogon/logout.do

[log]
level = warn
filters = plugin.sasesp-plugin:debug

[users]
auto_assign_org = true
auto_assign_org_role = Admin

[auth.generic_oauth]
enabled = true
tls_skip_verify_insecure = true
name = SASLogon
auto_login = true
client_id = grafana
client_secret = viyagrafana
scopes = openid
email_attribute_path = email
login_attribute_path = user_name
name_attribute_path = name
auth_url =https://d19417.ingress-nginx.kc3-m1.esm.sashq-d.openstack.sas.com/SASLogon/oauth/authorize
token_url = https://d19417.ingress-nginx.kc3-m1.esm.sashq-d.openstack.sas.com/SASLogon/oauth/token
api_url = https://d19417.ingress-nginx.kc3-m1.esm.sashq-d.openstack.sas.com/SASLogon/userinfo
role_attribute_path = contains(grafana_roles[*], 'grafana-admin') && 'GrafanaAdmin' || contains(grafana_roles[*], 'admin') && 'Admin' || contains(grafana_roles[*], 'editor') && 'Editor' || 'Viewer'
41 changes: 41 additions & 0 deletions docker/dev/config/kc5-esplight_config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
app_mode = development
instance_name = grafana-oss

[plugins]
enable_alpha = true
app_tls_skip_verify_insecure = false
allow_loading_unsigned_plugins = sasesp-plugin

[server]
root_url = http://localhost:3000
serve_from_sub_path = true

[log]
level = warn
filters = plugin.sasesp-plugin:debug

[users]
auto_assign_org = true
auto_assign_org_role = Admin

[auth]
disable_login_form = true
signout_redirect_url = https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/oauth2/sign_out?rd=https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/uaa/logout.do?redirect=https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/uaa/login

[auth.generic_oauth]
tls_skip_verify_insecure = true
enabled = true
name = OAuth
use_pkce = true
auto_login = true
client_id = sv_client
client_secret = secret
scopes = openid email profile
email_attribute_path = email
name_attribute_path = user_name
login_attribute_path = user_name
auth_url = https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/uaa/oauth/authorize
token_url = https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/uaa/oauth/token?token_format=jwt
api_url = https://esplight.ingress-nginx.espsc-kc5-m1.espstudio.sashq-d.openstack.sas.com/uaa/userinfo
allow_assign_grafana_admin = true
role_attribute_path = contains(grafana_roles[*], 'grafana-admin') && 'GrafanaAdmin' || contains(grafana_roles[*], 'admin') && 'Admin' || contains(grafana_roles[*], 'editor') && 'Editor' || 'Viewer'
78 changes: 39 additions & 39 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.22.1

require (
github.com/fxamacker/cbor v1.5.1
github.com/google/uuid v1.4.0
github.com/google/uuid v1.6.0
github.com/grafana/grafana-plugin-sdk-go v0.195.0
github.com/sacOO7/gowebsocket v0.0.0-20221109081133-70ac927be105
)
Expand All @@ -19,52 +19,51 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/chromedp/cdproto v0.0.0-20231126232103-8e31ff06e23b // indirect
github.com/chromedp/cdproto v0.0.0-20240304214822-eeb3d13057c9 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/elazarl/goproxy v0.0.0-20231117061959-7cc037d33fb5 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/getkin/kin-openapi v0.122.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/getkin/kin-openapi v0.123.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/goccy/go-json v0.10.0 // indirect
github.com/go-openapi/jsonpointer v0.20.3 // indirect
github.com/go-openapi/swag v0.22.10 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/flatbuffers v23.1.21+incompatible // indirect
github.com/google/flatbuffers v23.5.26+incompatible // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/magefile/mage v1.15.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattetti/filebuffer v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sacOO7/go-logger v0.0.0-20180719173527-9ac9add5a50d // indirect
Expand All @@ -75,28 +74,29 @@ require (
github.com/urfave/cli v1.22.14 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
go.opentelemetry.io/contrib/propagators/jaeger v1.21.1 // indirect
go.opentelemetry.io/contrib/samplers/jaegerremote v0.15.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 // indirect
go.opentelemetry.io/contrib/propagators/jaeger v1.22.0 // indirect
go.opentelemetry.io/contrib/samplers/jaegerremote v0.16.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 826c198

Please sign in to comment.