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

Remove relative path info from executable field #1839

Merged
merged 7 commits into from
Jun 18, 2024
Merged

Remove relative path info from executable field #1839

merged 7 commits into from
Jun 18, 2024

Conversation

wbrowne
Copy link
Member

@wbrowne wbrowne commented Jun 13, 2024 •
edited
Loading

Related to #1785

A change in the plugin SDK allows us now to not require the nested datasource executable to live in the parent root directory.

@wbrowne wbrowne requested a review from gabor June 13, 2024 10:59
@wbrowne wbrowne self-assigned this Jun 13, 2024
@wbrowne wbrowne requested a review from a team as a code owner June 13, 2024 10:59
wbrowne
wbrowne commented Jun 13, 2024
View reviewed changes
src/datasource/plugin.json Outdated Show resolved Hide resolved
@zoltanbedi @wbrowne
Update src/datasource/plugin.json
7b97265 
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
@zoltanbedi
Copy link
Member

zoltanbedi commented Jun 13, 2024 •
edited
Loading

@wbrowne I'm trying this out but it is not working for me. It tries to get the executable from the datasource folder. am I missing something?
This is the error message: Could not initialize plugin" pluginId=alexanderzobnin-zabbix-datasource error="fork/exec /grafana-zabbix/dist/datasource/gpx_zabbix-datasource_linux_arm64: no such file or directory"

I deleted the dist folder. run mage -v and then yarn build

@wbrowne
Copy link
Member Author

wbrowne commented Jun 13, 2024

@wbrowne I'm trying this out but it is not working for me. It tries to get the executable from the datasource folder. am I missing something? This is the error message: Could not initialize plugin" pluginId=alexanderzobnin-zabbix-datasource error="fork/exec /grafana-zabbix/dist/datasource/gpx_zabbix-datasource_linux_arm64: no such file or directory"

I deleted the dist folder. run mage -v and then yarn build

Let me check I didn't miss something!

zoltanbedi and others added 5 commits June 18, 2024 08:55
@zoltanbedi @wbrowne
Fix: Problems panel failing for versions before 7.0.0 (#1840)
09e12a0 
* Fix: Problems panel failing for versions before 7.0.0

* Add tests

* Use spy instead of new argument
@zoltanbedi @wbrowne
Chore: Release prep 4.5.1
4aea2f6
@dependabot @wbrowne
Bump braces from 3.0.2 to 3.0.3
86bbf32 
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@wbrowne
update to 0.236.0
d588d7b
@wbrowne
Merge branch 'main' into executable-path-fix
be0eef5
@wbrowne
Copy link
Member Author

wbrowne commented Jun 18, 2024

@zoltanbedi could you take it for a spin now and let me know if it's okay for you? 🙏 Can you also confirm the directory structure of the built plugin looks like the following:

Plugin dist 
./go_plugin_build_manifest
./datasource
./datasource/query_help.md
./datasource/gpx_zabbix-datasource_windows_amd64.exe
./datasource/gpx_zabbix-datasource_darwin_amd64
./datasource/gpx_zabbix-datasource_linux_arm64
./datasource/module.js.map
./datasource/plugin.json
./datasource/img
./datasource/img/icn-zabbix-datasource.svg
./datasource/module.js
./datasource/dashboards
./datasource/dashboards/template_linux_server.json
./datasource/dashboards/zabbix_system_status.json
./datasource/dashboards/zabbix_server_dashboard.json
./datasource/gpx_zabbix-datasource_linux_arm
./datasource/gpx_zabbix-datasource_linux_amd64
./datasource/gpx_zabbix-datasource_darwin_arm64
./LICENSE
./panel-triggers
./panel-triggers/module.js.LICENSE.txt
./panel-triggers/module.js.map
./panel-triggers/plugin.json
./panel-triggers/img
./panel-triggers/img/icn-zabbix-problems-panel.svg
./panel-triggers/module.js
./CHANGELOG.md
./module.js.map
./plugin.json
./README.md
./img
./img/screenshot-annotations.png
./img/screenshot-dashboard01.png
./img/icn-zabbix-app.svg
./img/screenshot-triggers.png
./img/screenshot-showcase.png
./img/screenshot-metric_editor.png
./styles
./styles/dark.css
./styles/light.css
./module.js

zoltanbedi
zoltanbedi approved these changes Jun 18, 2024
View reviewed changes
Copy link
Member

@zoltanbedi zoltanbedi left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @wbrowne!

@zoltanbedi zoltanbedi merged commit 3b2827e into main Jun 18, 2024
4 checks passed
@zoltanbedi zoltanbedi deleted the executable-path-fix branch June 18, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zoltanbedi zoltanbedi zoltanbedi approved these changes

@gabor gabor Awaiting requested review from gabor

@yesoreyeram yesoreyeram Awaiting requested review from yesoreyeram yesoreyeram is a code owner automatically assigned from grafana/oss-big-tent

@gwdawson gwdawson Awaiting requested review from gwdawson gwdawson is a code owner automatically assigned from grafana/oss-big-tent

Assignees

@wbrowne wbrowne

Labels
type/bug
Projects
OSS Big Tent
Status: Complete
Plugins Platform / Grafana Community
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wbrowne @zoltanbedi