Skip to content
This repository has been archived by the owner on Dec 8, 2021. It is now read-only.

ClickHouse Database datasource plugin update to 2.2.0 #803

Merged
merged 7 commits into from
Jan 7, 2021

Conversation

Slach
Copy link
Contributor

@Slach Slach commented Nov 30, 2020

2.2.0 (2020-11-30)

Enhancement:

Fixes:

Signed-off-by: Eugene Klimov [email protected]

# 2.2.0 (2020-11-30)
## Enhancement:

* add region support to annotation query, try to fix wrong column orders for table format, fix Altinity/clickhouse-grafana#303
* add plugin sign process, fix Altinity/clickhouse-grafana#212
* add `DateTime64` support, fix Altinity/clickhouse-grafana#292
* add `linux\arm64` backend plugin build
* improve ARRAY JOIN parsing, fix Altinity/clickhouse-grafana#284
* improve `docker-compose.yaml` add ability to redefine `GRAFANA_VERSION` and `CLICKHOUSE_VERSION` via environment variables `latest` by default

## Fixes:
* add `*.js.map` and `*.js` from src and spec folder to .gitignore
* don't apply adhoc filters twice when used $adhoc macros, fix Altinity/clickhouse-grafana#282
* fix corner case for table format with wrong columns order between meta and data response section, fix Altinity/clickhouse-grafana#281
* add trickster to docker-compose environment
* actualize links in README.md

Signed-off-by: Eugene Klimov <[email protected]>
@marcusolsson
Copy link
Contributor

Hi @Slach,

Since Grafana 7.3, we've changed how we package plugins. For more information, refer to Package a plugin.

You can enter the URL to the plugin archive in the plugin validator to see if it's ready to be published. Let me know if you have any questions!

@marcusolsson marcusolsson added type/datasource Categorizes the submission as a data source plugin_update labels Dec 3, 2020
@Slach
Copy link
Contributor Author

Slach commented Dec 14, 2020

@marcusolsson please look at this PR again, currently, all plugin-validator checks passed

Signed-off-by: Eugene Klimov <[email protected]>
@Slach
Copy link
Contributor Author

Slach commented Dec 22, 2020

@marcusolsson any news about this Pull Request?

@Slach
Copy link
Contributor Author

Slach commented Jan 2, 2021

@marcusolsson please merge this pull request

@Slach
Copy link
Contributor Author

Slach commented Jan 4, 2021

@marcusolsson could you look at this PR again?
anything else that I should do to able this PR to merge?

@marcusolsson
Copy link
Contributor

Hi @Slach,

Just got back from the holidays 👋 Will take a look at this in the coming days!

@marcusolsson
Copy link
Contributor

It looks like you're affected by a bug in the sign command where grafana-toolkit generates invalid paths in the MANIFEST.txt (I believe this bug appears when running the sign command on a Windows machine). For more information, refer to #798 (comment).

Could you please update the manifest with the changes listed below?

In the MANIFEST.txt, change the double backslash, \\, in the file names to a forward slash, /.

For example, change:

"img\\annotations.png": "09cc19df992fede5c4dd830f7b3c7a783702feced07ea9693d417ec127077b00",

into

"img/annotations.png": "09cc19df992fede5c4dd830f7b3c7a783702feced07ea9693d417ec127077b00",

@Slach
Copy link
Contributor Author

Slach commented Jan 5, 2021

@marcusolsson done
please check and merge pull request

@Slach
Copy link
Contributor Author

Slach commented Jan 5, 2021

@Slach
Copy link
Contributor Author

Slach commented Jan 5, 2021

@marcusolsson
Copy link
Contributor

I can see that you've fixed the MANIFEST file. Unfortunately, I'm still getting a warning about a "Modified signature" when I try to load it.

Screen Shot 2021-01-05 at 18 45 15

I think the errors are due to an unsupported archive structure. It looks like the plugin assets are located at the root of the ZIP archive instead of in a directory named as the plugin ID.

Could you verify that you've packaged your plugin according to the instructions on Package a plugin, i.e.:

yarn build
mage
mv dist/ vertamedia-clickhouse-datasource
zip vertamedia-clickhouse-datasource-2.2.0.zip vertamedia-clickhouse-datasource -r

For future reference, I recommend that you take a look at the GitHub Actions for building, testing, and packaging plugins. It should make life easier :)

@Slach
Copy link
Contributor Author

Slach commented Jan 5, 2021

@marcusolsson done
image
please merge

@Slach
Copy link
Contributor Author

Slach commented Jan 5, 2021

@marcusolsson could you suggest when a bug in the signing process will fix and npx @grafana/toolkit plugin:sign will work properly in all OSes?

@marcusolsson
Copy link
Contributor

Thank you for your patience and for fixing the issues so quickly! I can confirm that the plugin is packaged correctly. Marking this as ready for review. You can see your current position in the review queue on the project board.

I'm not aware of a fix at the moment, but I will check with the plugin team tomorrow for when this can be fixed.

@marcusolsson
Copy link
Contributor

Published! 🎉

@marcusolsson marcusolsson merged commit 3d3e4ae into grafana:master Jan 7, 2021
@marcusolsson
Copy link
Contributor

@Slach FYI, here's the pull request for the issue with the invalid MANIFEST.txt: grafana/grafana#30287

@Slach
Copy link
Contributor Author

Slach commented Jan 14, 2021

@marcusolsson thanks a lot for suggestion

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type/datasource Categorizes the submission as a data source
Projects
None yet
2 participants