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.

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

Pull in new datasources and upgrade dependencies #48

Merged
merged 18 commits into from
Feb 7, 2024

Conversation

ChrisStrykesAgain
Copy link
Contributor

The goal here was to pull in the relevant datasources being developed for SLE so that they can be used with SLS.

Doing so involved several modifications to this existing SLS Grafana repo, including upgrading the Grafana version used, updating the dependencies of the existing notebook and test monitor plugins, and changing a function in the notebook plugin to remove a dependency on a private package that prevented it from building cleanly.

Specific plugins added included the Workspace, Tag, and Systems datasources. The Plotly plugin from the SLE repo was also pulled in, in lieu of the one pre-existing in this repo.

@ChrisStrykesAgain
Copy link
Contributor Author

FYI, I decided to convert this to a draft while my team does some interactive testing with a local build. I don't foresee any further changes, but decided it was probably for the best to get the extra testing.

@ChrisStrykesAgain ChrisStrykesAgain marked this pull request as ready for review January 12, 2024 15:46
Copy link
Collaborator

@mure mure left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for figuring all of this out.
One thought - if we're pulling the plotly panel from the SLE repo, let's go ahead and delete it from this one.

build.sh Outdated Show resolved Hide resolved
config/datasources.yml Outdated Show resolved Hide resolved
@ChrisStrykesAgain
Copy link
Contributor Author

Not sure how I ended up with a conflict here, but could someone with write access give me a hand? We're in a good spot to merge based on testing.

@cameronwaterman
Copy link
Collaborator

Not sure how I ended up with a conflict here, but could someone with write access give me a hand? We're in a good spot to merge based on testing.

Is the conflict not something you can resolve? I agree it is odd that you somehow got a conflict

…ull-in-new-datasources

# Conflicts:
#	README.md
@mure
Copy link
Collaborator

mure commented Feb 7, 2024

@ChrisStrykesAgain You somehow have conflicts with a 2-year old commit. Since this is a fork PR, I'm not sure if I have the permissions to fix it on your end. If you give me write access to https://github.com/ChrisStrykesAgain/grafana-plugins/tree/pull-in-new-datasources I don't mind resolving it.

@ChrisStrykesAgain
Copy link
Contributor Author

I actually figured it out. There was a message that said something to the effect that I didn't have write permissions on the origin, so I should ask someone who does. I didn't think about the fact I could just fix it in my branch instead.

@mure mure merged commit 97bf7ef into ni:master Feb 7, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants