Skip to content

feat(inputs.openstack): Allow collection without admin privileges #15468

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
merged 3 commits into from
Jun 11, 2024
Merged

feat(inputs.openstack): Allow collection without admin privileges #15468

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e147904
chore(inputs.openstack): Simplify code and avoid cross-dependencies b…
srebhan Jun 6, 2024
c911e90
fetch only user projects in order to expand flavor attributes
Jun 6, 2024
3f9c982
Restrict initial project listing to only those available to the curre…
srebhan Jun 7, 2024
File filter

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
Restrict initial project listing to only those available to the curre… 
…nt user
  • Loading branch information
@srebhan
srebhan committed Jun 10, 2024
commit 3f9c982d09ba748622013155c192302e6d57770a
13 changes: 1 addition & 12 deletions plugins/inputs/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/projects"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/services"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/users"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/agents"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
Expand Down Expand Up @@ -251,17 +250,7 @@ func (o *OpenStack) Start(telegraf.Accumulator) error {
}

// We need the project to deliver a human readable name in servers

// Get session token details and extract the user id in order to fetch their projects
// FIXME?: the provider object might already contain the user info - i haven't managed to find it
token := tokens.Get(context.TODO(), o.identity, provider.TokenID)
user, err := token.ExtractUser()
if err != nil {
return fmt.Errorf("unable to extract user from the obtained token: %w", err)
}
o.Log.Debug("obtained user: %+v", user)

page, err = users.ListProjects(o.identity, user.ID).AllPages(ctx)
page, err = projects.ListAvailable(o.identity).AllPages(ctx)
if err != nil {
return fmt.Errorf("unable to list projects: %w", err)
}
Expand Down