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

Cherry picks for v0.40.5 #6907

Merged
merged 8 commits into from
May 15, 2024
Merged

Cherry picks for v0.40.5 #6907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8cbcdde
azure_exporter: Fix bug which prevents subscription scope from workin…
kgeckhart Apr 3, 2024
3161f63
Update postgres exporter (#6780)
thampiotr Apr 3, 2024
c74bd32
Update SNMP exporter (#6904)
ptodev May 15, 2024
be8f3ed
Update Loki dependency (#6905)
ptodev May 15, 2024
13653fa
Update changelog
ptodev May 15, 2024
fd977f6
Update loki dep to k190 (#6543)
thampiotr Feb 28, 2024
13089c8
Update vmware_exporter
ptodev May 15, 2024
8bfc0c9
Update prom encoder
ptodev May 15, 2024
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
Prev Previous commit
Next Next commit
Update loki dep to k190 (#6543) 
* Update loki dep to k190

* port renames

* fix loki push api
  • Loading branch information
@thampiotr @ptodev
thampiotr authored and ptodev committed May 15, 2024
commit fd977f62abf4603f8e9351caab326b94f6d79745
4 changes: 2 additions & 2 deletions component/common/net/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ func (g *GRPCConfig) Into(c *dskit.Config) {
c.GRPCServerMaxConnectionAge = g.MaxConnectionAge
c.GRPCServerMaxConnectionAgeGrace = g.MaxConnectionAgeGrace
c.GRPCServerMaxConnectionIdle = g.MaxConnectionIdle
c.GPRCServerMaxRecvMsgSize = g.ServerMaxRecvMsg
c.GRPCServerMaxRecvMsgSize = g.ServerMaxRecvMsg
c.GRPCServerMaxSendMsgSize = g.ServerMaxSendMsg
c.GPRCServerMaxConcurrentStreams = g.ServerMaxConcurrentStreams
c.GRPCServerMaxConcurrentStreams = g.ServerMaxConcurrentStreams
}

// Convert converts the River-based ServerConfig into a dskit.Config object.
Expand Down
8 changes: 4 additions & 4 deletions component/common/net/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestConfig(t *testing.T) {
require.Equal(t, time.Second*30, config.ServerGracefulShutdownTimeout)

require.Equal(t, size4MB, config.GRPCServerMaxSendMsgSize)
require.Equal(t, size4MB, config.GPRCServerMaxRecvMsgSize)
require.Equal(t, size4MB, config.GRPCServerMaxRecvMsgSize)
},
},
"overriding defaults": {
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestConfig(t *testing.T) {
require.Equal(t, "0.0.0.0", config.GRPCListenAddress)
require.Equal(t, 10, config.GRPCServerMaxSendMsgSize)
// this should have the default applied
require.Equal(t, size4MB, config.GPRCServerMaxRecvMsgSize)
require.Equal(t, size4MB, config.GRPCServerMaxRecvMsgSize)

require.Equal(t, time.Minute, config.ServerGracefulShutdownTimeout)
},
Expand Down Expand Up @@ -141,9 +141,9 @@ func TestConfig(t *testing.T) {
require.Equal(t, 5*time.Minute, config.GRPCServerMaxConnectionAge)
require.Equal(t, 6*time.Minute, config.GRPCServerMaxConnectionAgeGrace)
require.Equal(t, 7*time.Minute, config.GRPCServerMaxConnectionIdle)
require.Equal(t, 5, config.GPRCServerMaxRecvMsgSize)
require.Equal(t, 5, config.GRPCServerMaxRecvMsgSize)
require.Equal(t, 6, config.GRPCServerMaxSendMsgSize)
require.Equal(t, uint(7), config.GPRCServerMaxConcurrentStreams)
require.Equal(t, uint(7), config.GRPCServerMaxConcurrentStreams)
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion component/loki/source/api/internal/lokipush/push_api_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (s *PushAPIServer) getRelabelRules() []*relabel.Config {
func (s *PushAPIServer) handleLoki(w http.ResponseWriter, r *http.Request) {
logger := util_log.WithContext(r.Context(), util_log.Logger)
userID, _ := tenant.TenantID(r.Context())
req, err := push.ParseRequest(logger, userID, r, nil)
req, err := push.ParseRequest(logger, userID, r, nil, nil, push.ParseLokiRequest)
if err != nil {
level.Warn(s.logger).Log("msg", "failed to parse incoming push request", "err", err.Error())
http.Error(w, err.Error(), http.StatusBadRequest)
Expand Down
4 changes: 2 additions & 2 deletions converter/internal/common/weaveworks_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ func WeaveWorksServerToFlowServer(config server.Config) *fnet.ServerConfig {
MaxConnectionAge: config.GRPCServerMaxConnectionAge,
MaxConnectionAgeGrace: config.GRPCServerMaxConnectionAgeGrace,
MaxConnectionIdle: config.GRPCServerMaxConnectionIdle,
ServerMaxRecvMsg: config.GPRCServerMaxRecvMsgSize,
ServerMaxRecvMsg: config.GRPCServerMaxRecvMsgSize,
ServerMaxSendMsg: config.GRPCServerMaxSendMsgSize,
ServerMaxConcurrentStreams: config.GPRCServerMaxConcurrentStreams,
ServerMaxConcurrentStreams: config.GRPCServerMaxConcurrentStreams,
},
GracefulShutdownTimeout: config.ServerGracefulShutdownTimeout,
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/logs/logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestLogs(t *testing.T) {
})
go func() {
_ = http.Serve(lis, http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
req, err := push.ParseRequest(log.NewNopLogger(), "user_id", r, nil)
req, err := push.ParseRequest(log.NewNopLogger(), "user_id", r, nil, nil, push.ParseLokiRequest)
require.NoError(t, err)

pushes <- req
Expand Down
Loading