search

ni / grafana-plugins

Grafana plugins and configuration for SystemLink Server
MIT License
2 stars 3 forks source link

Pull in new datasources and upgrade dependencies #48

Closed ChrisStrykesAgain closed 9 months ago

ChrisStrykesAgain commented 9 months ago

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 commented 9 months ago

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 commented 9 months ago

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 commented 9 months ago

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

mure commented 9 months ago

@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 commented 9 months ago

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.