Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Patch release 2.7.1 #21069

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

Merged
Ferroin merged 2 commits into from
Sep 29, 2025
Merged

Patch release 2.7.1 #21069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed9cf5c
Win plugin files with .plugin extension (#21068)
stelfrag Sep 29, 2025
00571e4
improve(go.d/rabbitmq): add support for old RabbitMQ whoami tags form…
ilyam8 Sep 25, 2025
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
7 changes: 6 additions & 1 deletion src/go/plugin/go.d/collector/rabbitmq/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ func (c *Collector) getClusterMeta() (id string, name string, err error) {
return "", "", fmt.Errorf("unexpected response: whoami: user name n is empty")
}

if !slices.Contains(user.Tags, "administrator") {
// In RabbitMQ < 3.8.3 the `tags` field may be returned as a single string
// (e.g. "administrator,management") instead of an array. We intentionally
// treat it as one tag and do not split on commas here.
if !slices.ContainsFunc(user.Tags, func(s string) bool {
return strings.Contains(s, "administrator")
}) {
c.Warningf("user %s lacks 'administrator' tag: cluster ID and name cannot be collected.", user.Name)
return "", "", nil
}
Expand Down
27 changes: 25 additions & 2 deletions src/go/plugin/go.d/collector/rabbitmq/restapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

package rabbitmq

import (
"encoding/json"
"fmt"
)

const (
urlPathAPIWhoami = "/api/whoami"
urlPathAPIDefinitions = "/api/definitions"
Expand All @@ -12,8 +17,26 @@ const (
)

type apiWhoamiResp struct {
Name string `json:"name"`
Tags []string `json:"tags"`
Name string `json:"name"`
Tags apiWhoamiTags `json:"tags"`
}

type apiWhoamiTags []string

func (a *apiWhoamiTags) UnmarshalJSON(data []byte) error {
var multi []string
if err := json.Unmarshal(data, &multi); err == nil {
*a = multi
return nil
}

var single string
if err := json.Unmarshal(data, &single); err == nil {
*a = []string{single}
return nil
}

return fmt.Errorf("unexpected tags format: %s", string(data))
}

type apiDefinitionsResp struct {
Expand Down
1 change: 1 addition & 0 deletions src/plugins.d/plugins_d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ static bool is_plugin(char *dst, size_t dst_size, const char *filename) {
".plugin.exe",
"_plugin.exe",
"-plugin.exe",
".plugin",
NULL
};
#else
Expand Down
Loading