Skip to content

Commit

Permalink
repo owner changes
Browse files Browse the repository at this point in the history
  • Loading branch information
yesoreyeram committed Nov 23, 2023
1 parent e45569a commit 50c964d
Show file tree
Hide file tree
Showing 74 changed files with 180 additions and 174 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @grafana/oss-big-tent
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
blank_issues_enabled: false
contact_links:
- name: General Questions?
url: https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/new?category=q-a
url: https://github.com/grafana/grafana-infinity-datasource/discussions/new?category=q-a
about: Use our Q&A Section in our docs to get answers for your questions
- name: Specific API?
url: https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/new?category=specific-apis
about: Questions about specific APIs. You may have already answer here https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/categories/specific-apis
url: https://github.com/grafana/grafana-infinity-datasource/discussions/new?category=specific-apis
about: Questions about specific APIs. You may have already answer here https://github.com/grafana/grafana-infinity-datasource/discussions/categories/specific-apis
- name: Feature Request?
url: https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/new?category=ideas
url: https://github.com/grafana/grafana-infinity-datasource/discussions/new?category=ideas
about: Have an interesting idea to improve the plugin? Or see any killing feature is missing?
- name: Showcase
url: https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/new?category=show-and-tell
url: https://github.com/grafana/grafana-infinity-datasource/discussions/new?category=show-and-tell
about: Have an inspiring use-case? Use our show & tell section to share with the community.
- name: Docs
url: https://yesoreyeram.github.io/grafana-infinity-datasource
url: https://grafana.github.io/grafana-infinity-datasource
about: Docs
- name: Bug in UQL?
url: https://github.com/yesoreyeram/uql
Expand Down
22 changes: 11 additions & 11 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</p>

<p align="center">
<a href="https://yesoreyeram.github.io/grafana-infinity-datasource">
<img src="https://raw.githubusercontent.com/yesoreyeram/grafana-infinity-datasource/main/src/img/icon.svg" alt="Grafana Infinity Datasource" width=140">
<a href="https://grafana.github.io/grafana-infinity-datasource">
<img src="https://raw.githubusercontent.com/grafana/grafana-infinity-datasource/main/src/img/icon.svg" alt="Grafana Infinity Datasource" width=140">
</a>
</p>

Expand Down Expand Up @@ -53,37 +53,37 @@
You can download and install this grafana plugin using various options

- From [Grafana plugin catalog](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource/)
- From [Github release page](https://github.com/yesoreyeram/grafana-infinity-datasource/releases) (also available beta, pre-release versions)
- From [Github release page](https://github.com/grafana/grafana-infinity-datasource/releases) (also available beta, pre-release versions)
- Using grafana cli
- `grafana-cli plugins install yesoreyeram-infinity-datasource`
- Using docker
- `docker run -p 3000:3000 -e "GF_INSTALL_PLUGINS=yesoreyeram-infinity-datasource" grafana/grafana:latest`

## 🎯 Documentation

For the plugin documentation, visit [plugin documentation website](https://yesoreyeram.github.io/grafana-infinity-datasource).
For the plugin documentation, visit [plugin documentation website](https://grafana.github.io/grafana-infinity-datasource).

## ⚡️ Useful Links

- [Plugin documentation](https://yesoreyeram.github.io/grafana-infinity-datasource)
- [Plugin documentation](https://grafana.github.io/grafana-infinity-datasource)
- [Demo video](https://youtu.be/Wmgs1E9Ry-s)

## 👍 Contributing

you can contribute in one of the following ways

- If you find any interesting APIs, [showcase](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/categories/show-and-tell) how you are using the API with Infinity datasource so that other community members will get benefit out of it.
- [Test different APIs](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/categories/specific-apis) and create bugs if not working as expected
- Read the [contributing guide](https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/CONTRIBUTING.md) for more details
- If you find any interesting APIs, [showcase](https://github.com/grafana/grafana-infinity-datasource/discussions/categories/show-and-tell) how you are using the API with Infinity datasource so that other community members will get benefit out of it.
- [Test different APIs](https://github.com/grafana/grafana-infinity-datasource/discussions/categories/specific-apis) and create bugs if not working as expected
- Read the [contributing guide](https://github.com/grafana/grafana-infinity-datasource/blob/main/CONTRIBUTING.md) for more details

## ⭐️ Project assistance

If you want to say **thank you** or/and support active development of `Grafana Infinity Datasource`:

- Add a [GitHub Star](https://github.com/yesoreyeram/grafana-infinity-datasource) to the project.
- Tweet about project [on your Twitter](https://twitter.com/intent/tweet?text=Checkout%20this%20cool%20%23grafana%20datasource%20%40grafanainfinity.%20%0A%0ALiterally,%20get%20your%20data%20from%20anywhere%20into%20%23grafana.%20JSON,%20CSV,%20XML,%20GraphQL,%20OAuth2,%20RSS%20feed,%20%23kubernetes,%20%23azure,%20%23aws,%20%23gcp%20and%20more%20stuff.%0A%0Ahttps%3A//yesoreyeram.github.io/grafana-infinity-datasource%0A).
- Add a [GitHub Star](https://github.com/grafana/grafana-infinity-datasource) to the project.
- Tweet about project [on your Twitter](https://twitter.com/intent/tweet?text=Checkout%20this%20cool%20%23grafana%20datasource%20%40grafanainfinity.%20%0A%0ALiterally,%20get%20your%20data%20from%20anywhere%20into%20%23grafana.%20JSON,%20CSV,%20XML,%20GraphQL,%20OAuth2,%20RSS%20feed,%20%23kubernetes,%20%23azure,%20%23aws,%20%23gcp%20and%20more%20stuff.%0A%0Ahttps%3A//grafana.github.io/grafana-infinity-datasource%0A).
- Write articles about project on [Dev.to](https://dev.to/), [Medium](https://medium.com/) or personal blog.

## ⚠️ License

This project is licensed under [Apache 2.0](https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/LICENSE)
This project is licensed under [Apache 2.0](https://github.com/grafana/grafana-infinity-datasource/blob/main/LICENSE)
22 changes: 13 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 2.3.0

🎉 Infinity datasource plugin is now officially maintained by Grafana Labs.

## 2.2.1

⚙️ **Chore**: Added distributed tracing and contextual logging
Expand Down Expand Up @@ -40,7 +44,7 @@

🐛 **OAuth2**: Applied a fix for the UI crash when editing OAuth2 section in the config editor

🐛 **URL normalization**: Fixed a bug where some github URLs were interpolated incorrectly. Fixes [#604](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/604)
🐛 **URL normalization**: Fixed a bug where some github URLs were interpolated incorrectly. Fixes [#604](https://github.com/grafana/grafana-infinity-datasource/issues/604)

🐛 **Test**: Fixed a bug in tests

Expand All @@ -54,9 +58,9 @@

## 2.0.0

🎉 **Pagination**: Added pagination support for json type queries ( backend parser ). Refer [this github discussion](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/601) for more details
🎉 **Pagination**: Added pagination support for json type queries ( backend parser ). Refer [this github discussion](https://github.com/grafana/grafana-infinity-datasource/discussions/601) for more details

🎉 **Transformation**: Added support for server side transformations via transformations query type. This version supports transformations such as `limit`, `filterExpression`, `computedColumn` and `summarize`. Refer [this github discussion](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/614) for more details
🎉 **Transformation**: Added support for server side transformations via transformations query type. This version supports transformations such as `limit`, `filterExpression`, `computedColumn` and `summarize`. Refer [this github discussion](https://github.com/grafana/grafana-infinity-datasource/discussions/614) for more details

🚀 **Health Check**: Added support for custom health check

Expand Down Expand Up @@ -85,8 +89,8 @@
- **Variables** Support for custom display values in variables ( using `__text` and `__value` as field names )
- **Backend parser** Added support for numeric datetime (ex: 20221227 can now be treated as valid datetime with YYYYMMDD format)
- **Global variables** Support for global time variables `${__from}` and `${__to}` in backend queries
- **Bug fix** Fixes [a bug](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/509) where variables weren't interpolated with xml/html backend queries.
- **Bug fix** Fixed [a bug](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/453) where BOM encoded response weren't parsed correctly
- **Bug fix** Fixes [a bug](https://github.com/grafana/grafana-infinity-datasource/issues/509) where variables weren't interpolated with xml/html backend queries.
- **Bug fix** Fixed [a bug](https://github.com/grafana/grafana-infinity-datasource/issues/453) where BOM encoded response weren't parsed correctly
- **Auth** Health check validation updated
- **Docs** Docs site UI update

Expand Down Expand Up @@ -125,7 +129,7 @@
## [ 1.0.1 ]

- **Macros/Variables** Global variables in queries such as `${__user.name}`,`${__user.email}` and `${__user.login}` interpolated correctly in server side
- **Bug fix** Fixed a bug where editor crashes when using POST method in variable editor. Fixes [#413](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/413)
- **Bug fix** Fixed a bug where editor crashes when using POST method in variable editor. Fixes [#413](https://github.com/grafana/grafana-infinity-datasource/issues/413)

## [ 1.0.0 ]

Expand Down Expand Up @@ -163,7 +167,7 @@ jsonData:
If the allowed hosts are not configured correctly, you will get `Datasource is missing allowed hosts/URLs. Configure it in the datasource settings page.` error when performing the query.

Learn more about this breaking change in the [github discussion](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/322)
Learn more about this breaking change in the [github discussion](https://github.com/grafana/grafana-infinity-datasource/discussions/322)

#### **Content-Type and Accept headers**

Expand Down Expand Up @@ -243,7 +247,7 @@ Minimum required grafana version for the infinity plugin is now Grafana v8.4.7.
- "as-is" data format added for debugging
- comma in the numbers are now ignored and considered as number
- variable editor, global query editor bug fixes. Previously, unable to add columns in variable editor
- fixes [#191](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/191), [#146](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/146), [#210](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/210)
- fixes [#191](https://github.com/grafana/grafana-infinity-datasource/issues/191), [#146](https://github.com/grafana/grafana-infinity-datasource/issues/146), [#210](https://github.com/grafana/grafana-infinity-datasource/issues/210)

## [ 0.7.10 ]

Expand Down Expand Up @@ -292,7 +296,7 @@ Minimum required grafana version for the infinity plugin is now Grafana v8.4.7.

## [ 0.7.1 ]

- Fix for [mixed datasource mode not working in 0.7](https://github.com/yesoreyeram/grafana-infinity-datasource/issues/78)
- Fix for [mixed datasource mode not working in 0.7](https://github.com/grafana/grafana-infinity-datasource/issues/78)

## [ 0.7.0 ]

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

If you want to contribute to the plugin, you can contribute in one of the following ways

- [Test different APIs](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/categories/specific-apis) and create bugs if not working as expected
- If you find any interesting APIs, [showcase](https://github.com/yesoreyeram/grafana-infinity-datasource/discussions/categories/show-and-tell) how you are using the API with Infinity datasource so that other community members will get benefit out of it.
- [Test different APIs](https://github.com/grafana/grafana-infinity-datasource/discussions/categories/specific-apis) and create bugs if not working as expected
- If you find any interesting APIs, [showcase](https://github.com/grafana/grafana-infinity-datasource/discussions/categories/show-and-tell) how you are using the API with Infinity datasource so that other community members will get benefit out of it.

## Setting up locally for development

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023 Sriramajeyam Sugumaran
Copyright 2023 Grafana Labs

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints.

[![click here for documentation](https://user-images.githubusercontent.com/153843/189100076-7fe3535d-0bc3-4e4a-b37d-14934ae621db.png)](https://yesoreyeram.github.io/grafana-infinity-datasource)
[![click here for documentation](https://user-images.githubusercontent.com/153843/189100076-7fe3535d-0bc3-4e4a-b37d-14934ae621db.png)](https://grafana.github.io/grafana-infinity-datasource)

## Documentation

Detailed documentation and examples are available in [plugin website](https://yesoreyeram.github.io/grafana-infinity-datasource)
Detailed documentation and examples are available in [plugin website](https://grafana.github.io/grafana-infinity-datasource)

Docs on how to use JSON API - [Docs](https://yesoreyeram.github.io/grafana-infinity-datasource/docs/json)
Docs on how to use JSON API - [Docs](https://grafana.github.io/grafana-infinity-datasource/docs/json)

### [Demo video](https://youtu.be/Wmgs1E9Ry-s)

Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/csv.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ const visitExplorePage = (query: Partial<InfinityQuery> = {}) => {
describe('explore', () => {
it.skip('should able to run CSV queries correctly', () => {
login();
visitExplorePage({ type: 'csv', url: 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.csv' });
visitExplorePage({ type: 'csv', url: 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.csv' });

checkDropdownValue('Type', 'CSV');
checkDropdownValue('Parser', 'Default');
checkDropdownValue('Source', 'URL');
checkInputContent('URL', 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.csv');
checkInputContent('URL', 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.csv');
checkDropdownValue('Format', 'Table');
runExploreQuery();
checkExploreTableContent(['Leanne Graham'].join(''));
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/explore.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('explore', () => {
checkDropdownValue('Type', 'JSON');
checkDropdownValue('Parser', 'Default');
checkDropdownValue('Source', 'URL');
checkInputContent('URL', 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.json');
checkInputContent('URL', 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.json');
checkDropdownValue('Format', 'Table');
runExploreQuery();
checkExploreTableContent(['age', 'country', 'name', 'occupation', 'salary', '38', 'USA', 'Leanne Graham', 'Devops Engineer', '3000'].join(''));
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/json.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('explore', () => {
checkDropdownValue('Type', 'JSON');
checkDropdownValue('Parser', 'Default');
checkDropdownValue('Source', 'URL');
checkInputContent('URL', 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.json');
checkInputContent('URL', 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.json');
checkDropdownValue('Format', 'Table');
runExploreQuery();
checkExploreTableContent('Leanne Graham');
Expand Down Expand Up @@ -46,7 +46,7 @@ describe('explore', () => {
// CSV with default parser should work
// changeDropdownValue('Type', 'CSV');
// checkExploreError('Invalid Opening Quote: a quote is found inside a field at line 3');
// changeInputContent('URL', 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.csv');
// changeInputContent('URL', 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.csv');
// changeDropdownValue('Parser', 'Default');
// checkExploreTableContent('Leanne Graham');
});
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tsv.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ const visitExplorePage = (query: Partial<InfinityQuery> = {}) => {
describe('explore', () => {
it.skip('should able to run TSV queries correctly', () => {
login();
visitExplorePage({ type: 'tsv', url: 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.tsv' });
visitExplorePage({ type: 'tsv', url: 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.tsv' });

checkDropdownValue('Type', 'TSV');
checkDropdownValue('Parser', 'Default');
checkDropdownValue('Source', 'URL');
checkInputContent('URL', 'https://github.com/yesoreyeram/grafana-infinity-datasource/blob/main/testdata/users.tsv');
checkInputContent('URL', 'https://github.com/grafana/grafana-infinity-datasource/blob/main/testdata/users.tsv');
checkDropdownValue('Format', 'Table');
runExploreQuery();
checkExploreTableContent(['Leanne Graham'].join(''));
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/yesoreyeram/grafana-infinity-datasource
module github.com/grafana/grafana-infinity-datasource

go 1.21

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grafana-infinity-datasource",
"version": "2.2.1",
"version": "2.3.0",
"description": "JSON, CSV, XML, GraphQL, HTML and REST API datasource for Grafana. Do infinite things with Grafana. Transform data with UQL/GROQ. Visualize data from many apis, RSS/ATOM feeds directly",
"main": "dist/module.js",
"scripts": {
Expand All @@ -24,7 +24,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/yesoreyeram/grafana-infinity-datasource.git"
"url": "git+https://github.com/grafana/grafana-infinity-datasource.git"
},
"keywords": [
"grafana",
Expand All @@ -48,12 +48,12 @@
"rss",
"feed"
],
"author": "Sriramajeyam Sugumaran",
"author": "Grafana Labs",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/yesoreyeram/grafana-infinity-datasource/issues"
"url": "https://github.com/grafana/grafana-infinity-datasource/issues"
},
"homepage": "https://yesoreyeram.github.io/grafana-infinity-datasource",
"homepage": "https://grafana.github.io/grafana-infinity-datasource",
"dependencies": {
"@emotion/css": "^11.9.0",
"@grafana/data": "8.4.7",
Expand Down
2 changes: 1 addition & 1 deletion pkg/infinity/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/grafana/grafana-infinity-datasource/pkg/models"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
"github.com/yesoreyeram/grafana-infinity-datasource/pkg/models"
)

type Client struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/infinity/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/http"
"testing"

"github.com/grafana/grafana-infinity-datasource/pkg/infinity"
"github.com/grafana/grafana-infinity-datasource/pkg/models"
"github.com/stretchr/testify/assert"
"github.com/yesoreyeram/grafana-infinity-datasource/pkg/infinity"
"github.com/yesoreyeram/grafana-infinity-datasource/pkg/models"
)

func TestInfinityClient_GetResults(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/infinity/csvBackend.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package infinity
import (
"context"

"github.com/grafana/grafana-infinity-datasource/pkg/models"
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/yesoreyeram/grafana-infinity-datasource/pkg/models"
"github.com/yesoreyeram/grafana-plugins/lib/go/csvframer"
"github.com/yesoreyeram/grafana-plugins/lib/go/gframer"
)
Expand Down
Loading

0 comments on commit 50c964d

Please sign in to comment.