Skip to content

Commit 455eeb2

Browse files
authored
updated broken links and references (#311)
1 parent 2c719b6 commit 455eeb2

File tree

12 files changed

+113
-144
lines changed

12 files changed

+113
-144
lines changed

CHANGELOG.md

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,60 @@
11
# Changelog
22

3+
## 1.3.2 (2022-10-14)
4+
5+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.3.1...v1.3.2)
6+
7+
- Fixed the broken docs and links
8+
39
## 1.3.1 (2022-01-24)
410

5-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.3.0...v1.3.1)
11+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.3.0...v1.3.1)
612

713
### Enhancements
814

9-
- Append suffix to param key to uniquify duplicate param keys [#232](https://github.com/marcusolsson/grafana-json-datasource/pull/232) (thanks [@rejohnst](https://github.com/rejohnst)!)
10-
- Added grafana global variables when doing a query using jsonata [#223](https://github.com/marcusolsson/grafana-json-datasource/pull/223) (thanks [@amng](https://github.com/amng)!)
15+
- Append suffix to param key to uniquify duplicate param keys [#232](https://github.com/grafana/grafana-json-datasource/pull/232) (thanks [@rejohnst](https://github.com/rejohnst)!)
16+
- Added grafana global variables when doing a query using jsonata [#223](https://github.com/grafana/grafana-json-datasource/pull/223) (thanks [@amng](https://github.com/amng)!)
1117

1218
### Bug fixes
1319

14-
- Certain strings incorrectly identified as dates [#202](https://github.com/marcusolsson/grafana-json-datasource/issues/202)
20+
- Certain strings incorrectly identified as dates [#202](https://github.com/grafana/grafana-json-datasource/issues/202)
1521

1622
## 1.3.0 (2021-09-03)
1723

18-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.2.1...v1.3.0)
24+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.2.1...v1.3.0)
1925

2026
### Enhancements
2127

22-
- Add support for JSONata ([#114](https://github.com/marcusolsson/grafana-json-datasource/issues/114)), a query language similar to JSONPath with support for transformations.
28+
- Add support for JSONata ([#114](https://github.com/grafana/grafana-json-datasource/issues/114)), a query language similar to JSONPath with support for transformations.
2329

2430
### Bug fixes
2531

26-
- Cannot read property 'filter' of undefined ([#156](https://github.com/marcusolsson/grafana-json-datasource/issues/156))
27-
32+
- Cannot read property 'filter' of undefined ([#156](https://github.com/grafana/grafana-json-datasource/issues/156))
2833

2934
## 1.2.1 (2021-06-18)
3035

31-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.2.0...v1.2.1)
36+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.2.0...v1.2.1)
3237

3338
### Enhancements
3439

3540
- Update dependencies, docs, and metadata
3641

3742
## 1.2.0 (2021-05-18)
3843

39-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.1.1...v1.2.0)
44+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.1.1...v1.2.0)
4045

4146
### Enhancements
4247

43-
- Adding $__isoFrom() and $__isoTo() macros ([#115](https://github.com/marcusolsson/grafana-json-datasource/pull/115)) (thanks [@jirkafajfr](https://github.com/jirkafajfr)!)
44-
- Using JSON.stringify instead of toString for object types in parseValue ([#111](https://github.com/marcusolsson/grafana-json-datasource/pull/111)) (thanks [@Totalus](https://github.com/Totalus)!)
48+
- Adding $**isoFrom() and $**isoTo() macros ([#115](https://github.com/grafana/grafana-json-datasource/pull/115)) (thanks [@jirkafajfr](https://github.com/jirkafajfr)!)
49+
- Using JSON.stringify instead of toString for object types in parseValue ([#111](https://github.com/grafana/grafana-json-datasource/pull/111)) (thanks [@Totalus](https://github.com/Totalus)!)
4550

4651
### Bug fixes
4752

48-
- Fix for macros not running in variable queries ([#100](https://github.com/marcusolsson/grafana-json-datasource/pull/100)) (thanks [@KensingtonTech](https://github.com/KensingtonTech)!)
53+
- Fix for macros not running in variable queries ([#100](https://github.com/grafana/grafana-json-datasource/pull/100)) (thanks [@KensingtonTech](https://github.com/KensingtonTech)!)
4954

5055
## 1.1.1 (2021-04-17)
5156

52-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.1.0...v1.1.1)
57+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.1.0...v1.1.1)
5358

5459
### Enhancements
5560

@@ -62,47 +67,47 @@
6267

6368
## 1.1.0 (2021-04-15)
6469

65-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.0.1...v1.1.0)
70+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.0.1...v1.1.0)
6671

6772
This release introduces an Experimental tab to the query editor. This will be used to let users try out features while they're being developed. Each feature has a link the the GitHub issue where you can share you feedback, before the feature is considered stable.
6873

6974
### Enhancements
7075

7176
- Extend variables support to options
72-
- Don't detect time fields from Unix epoch ([#82](https://github.com/marcusolsson/grafana-json-datasource/issues/82))
73-
- Add params to cache key ([#85](https://github.com/marcusolsson/grafana-json-datasource/issues/85))
77+
- Don't detect time fields from Unix epoch ([#82](https://github.com/grafana/grafana-json-datasource/issues/82))
78+
- Add params to cache key ([#85](https://github.com/grafana/grafana-json-datasource/issues/85))
7479
- Add support for field aliases
7580
- Add Experimental section to query editor to test features under development
76-
- Experimental: Group query results by field ([#36](https://github.com/marcusolsson/grafana-json-datasource/issues/36))
77-
- Experimental: Set display name for metric fields ([#36](https://github.com/marcusolsson/grafana-json-datasource/issues/36))
78-
- Experimental: Set optional label for variables ([#79](https://github.com/marcusolsson/grafana-json-datasource/issues/79))
81+
- Experimental: Group query results by field ([#36](https://github.com/grafana/grafana-json-datasource/issues/36))
82+
- Experimental: Set display name for metric fields ([#36](https://github.com/grafana/grafana-json-datasource/issues/36))
83+
- Experimental: Set optional label for variables ([#79](https://github.com/grafana/grafana-json-datasource/issues/79))
7984

8085
### Bug fixes
8186

82-
- Ignore hidden queries ([#83](https://github.com/marcusolsson/grafana-json-datasource/issues/83))
87+
- Ignore hidden queries ([#83](https://github.com/grafana/grafana-json-datasource/issues/83))
8388
- New queries don't use default values
8489

8590
## 1.0.1 (2021-03-05)
8691

87-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v1.0.0...v1.0.1)
92+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v1.0.0...v1.0.1)
8893

8994
### Enhancements
9095

9196
- Add annotation support
9297

9398
### Bug fixes
9499

95-
- Can't connect to API when URL contains encoded slash ([#59](https://github.com/marcusolsson/grafana-json-datasource/issues/59))
100+
- Can't connect to API when URL contains encoded slash ([#59](https://github.com/grafana/grafana-json-datasource/issues/59))
96101

97102
## 1.0.0 (2021-03-04)
98103

99-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.10.1...v1.0.0)
104+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.10.1...v1.0.0)
100105

101106
No noteworthy features or bug fixes in this release. Mostly metadata updates.
102107

103108
## 0.10.1 (2021-02-27)
104109

105-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.10.0...v0.10.1)
110+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.10.0...v0.10.1)
106111

107112
### Bug fixes
108113

@@ -111,31 +116,31 @@ No noteworthy features or bug fixes in this release. Mostly metadata updates.
111116

112117
## 0.10.0 (2021-02-19)
113118

114-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.9.2...v0.10.0)
119+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.9.2...v0.10.0)
115120

116121
### Enhancements
117122

118123
- Add auto-completion to JSON Path queries
119124

120125
## 0.9.2 (2021-02-03)
121126

122-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.9.1...v0.9.2)
127+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.9.1...v0.9.2)
123128

124129
### Bug fixes
125130

126-
- Variable queries fail with error ([#48](https://github.com/marcusolsson/grafana-json-datasource/issues/48))
131+
- Variable queries fail with error ([#48](https://github.com/grafana/grafana-json-datasource/issues/48))
127132

128133
## 0.9.1 (2021-02-01)
129134

130-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.9.0...v0.9.1)
135+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.9.0...v0.9.1)
131136

132137
### Bug fixes
133138

134-
- Cannot read property 'toString' of null ([#46](https://github.com/marcusolsson/grafana-json-datasource/issues/46))
139+
- Cannot read property 'toString' of null ([#46](https://github.com/grafana/grafana-json-datasource/issues/46))
135140

136141
## 0.9.0 (2021-02-01)
137142

138-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.8.0...v0.9.0)
143+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.8.0...v0.9.0)
139144

140145
**BREAKING CHANGE:** Query parameters set by the query editor no longer overrides the data source config, to match how headers are handled in the Grafana proxy. This establishes the convention that any configuration made by an administrator should have higher priority.
141146

@@ -153,52 +158,52 @@ This release deprecates the `queryString` property in the query model, in favor
153158

154159
## 0.8.0 (2021-01-08)
155160

156-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.7.1...v0.8.0)
161+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.7.1...v0.8.0)
157162

158163
### Enhancements
159164

160165
- Use the refId as the series name
161-
- Add type configuration for queries ([#37](https://github.com/marcusolsson/grafana-json-datasource/issues/37))
166+
- Add type configuration for queries ([#37](https://github.com/grafana/grafana-json-datasource/issues/37))
162167

163168
### Bug fixes
164169

165-
- Grafana Explore gets stuck when adding a second query ([#31](https://github.com/marcusolsson/grafana-json-datasource/issues/31))
170+
- Grafana Explore gets stuck when adding a second query ([#31](https://github.com/grafana/grafana-json-datasource/issues/31))
166171
- Multiple data source queries overwrite each other
167172

168173
## 0.7.1 (2020-12-07)
169174

170-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.7.0...v0.7.1)
175+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.7.0...v0.7.1)
171176

172177
### Bug fixes
173178

174-
- Falsy values are returned as NaN ([#25](https://github.com/marcusolsson/grafana-json-datasource/issues/25))
179+
- Falsy values are returned as NaN ([#25](https://github.com/grafana/grafana-json-datasource/issues/25))
175180

176181
## 0.7.0 (2020-12-04)
177182

178-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.6.4...v0.7.0)
183+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.6.4...v0.7.0)
179184

180185
### Enhancements
181186

182-
- Add support for custom paths ([#24](https://github.com/marcusolsson/grafana-json-datasource/pull/24))
183-
- Add epoch time macros ([#22](https://github.com/marcusolsson/grafana-json-datasource/pull/22))
187+
- Add support for custom paths ([#24](https://github.com/grafana/grafana-json-datasource/pull/24))
188+
- Add epoch time macros ([#22](https://github.com/grafana/grafana-json-datasource/pull/22))
184189
- Migrate to new form components. This bumps the minimum required Grafana version to 7.3.0
185190

186191
### Bug fixes
187192

188-
- Template variable chaining is not working ([#23](https://github.com/marcusolsson/grafana-json-datasource/issues/23))
189-
- Cannot read property 'length' of null ([#21](https://github.com/marcusolsson/grafana-json-datasource/issues/21))
193+
- Template variable chaining is not working ([#23](https://github.com/grafana/grafana-json-datasource/issues/23))
194+
- Cannot read property 'length' of null ([#21](https://github.com/grafana/grafana-json-datasource/issues/21))
190195

191196
## 0.6.4 (2020-11-30)
192197

193-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.6.3...v0.6.4)
198+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.6.3...v0.6.4)
194199

195200
### Bug fixes
196201

197202
- Fixes an issue where custom query parameters defined in the data source are flipped.
198203

199204
## 0.6.3 (2020-11-27)
200205

201-
[Full changelog](https://github.com/marcusolsson/grafana-json-datasource/compare/v0.6.2...v0.6.3)
206+
[Full changelog](https://github.com/grafana/grafana-json-datasource/compare/v0.6.2...v0.6.3)
202207

203208
### Enhancements
204209

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at marcus.olsson@hey.com. All
58+
reported by contacting the project team at info@grafana.com. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ Thank you for your interest in contributing to the plugin! 🙏 This document ex
77
- [Contribute documentation](#contribute-documentation)
88
- [Set up the project](#set-up-the-project)
99

10-
If you get stuck along the way, feel free to [ask for help](https://github.com/marcusolsson/grafana-json-datasource/discussions/new?category=q-a).
10+
If you get stuck along the way, feel free to [ask for help](https://github.com/grafana/grafana-json-datasource/discussions/new?category=q-a).
1111

1212
## Contribute code
1313

1414
To contribute code:
1515

1616
1. Check if there's an already existing issue that describes the reason or motivation behind your pull request.
17-
2. If there are no issues describing what you want to do, go ahead and [create one](https://github.com/marcusolsson/grafana-json-datasource/issues/new). By creating an issue before you start working on a fix, you can increase the chance of your pull request getting accepted! 💪
17+
2. If there are no issues describing what you want to do, go ahead and [create one](https://github.com/grafana/grafana-json-datasource/issues/new). By creating an issue before you start working on a fix, you can increase the chance of your pull request getting accepted! 💪
1818
3. Include any [documentation](contribute-documentation) that your changes might need.
1919
4. Write or update tests to verify that your changes work as expected.
20-
5. Now you're ready to [open a pull request](https://github.com/marcusolsson/grafana-json-datasource/compare)!
20+
5. Now you're ready to [open a pull request](https://github.com/grafana/grafana-json-datasource/compare)!
2121
6. In the description for your pull request, add a line that says `Fixes #123`, where `123` is the number of the issue the pull request fixes.
2222

2323
After you've created the pull request:
@@ -28,7 +28,7 @@ After you've created the pull request:
2828

2929
## Contribute documentation
3030

31-
This plugin uses [Docusaurus](https://docusaurus.io/) to build the [documentation](https://marcus.se.net/grafana-json-datasource).
31+
This plugin uses [Docusaurus](https://docusaurus.io/) to build the [documentation](https://grafana.github.io/grafana-json-datasource).
3232

3333
For more information about writing documentation using Docusaurus, refer to the [Docusaurus documentation](https://docusaurus.io/docs/).
3434

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2020 Marcus Olsson
189+
Copyright 2022 Grafana Labs
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
# JSON API data source for Grafana
22

3-
[![Build](https://github.com/marcusolsson/grafana-json-datasource/workflows/CI/badge.svg)](https://github.com/marcusolsson/grafana-json-datasource/actions?query=workflow%3A%22CI%22)
4-
[![Release](https://github.com/marcusolsson/grafana-json-datasource/workflows/Release/badge.svg)](https://github.com/marcusolsson/grafana-json-datasource/actions?query=workflow%3ARelease)
3+
[![Build](https://github.com/grafana/grafana-json-datasource/workflows/CI/badge.svg)](https://github.com/grafana/grafana-json-datasource/actions?query=workflow%3A%22CI%22)
4+
[![Release](https://github.com/grafana/grafana-json-datasource/workflows/Release/badge.svg)](https://github.com/grafana/grafana-json-datasource/actions?query=workflow%3ARelease)
55
[![Marketplace](https://img.shields.io/badge/dynamic/json?logo=grafana&color=F47A20&label=marketplace&prefix=v&query=%24.items%5B%3F%28%40.slug%20%3D%3D%20%22marcusolsson-json-datasource%22%29%5D.version&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins)](https://grafana.com/grafana/plugins/marcusolsson-json-datasource)
66
[![Downloads](https://img.shields.io/badge/dynamic/json?logo=grafana&color=F47A20&label=downloads&query=%24.items%5B%3F%28%40.slug%20%3D%3D%20%22marcusolsson-json-datasource%22%29%5D.downloads&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins)](https://grafana.com/grafana/plugins/marcusolsson-json-datasource)
7-
[![License](https://img.shields.io/github/license/marcusolsson/grafana-json-datasource)](LICENSE)
8-
[![Twitter](https://img.shields.io/twitter/follow/marcusolsson?color=%231DA1F2&label=twitter&style=plastic)](https://twitter.com/marcusolsson)
7+
[![License](https://img.shields.io/github/license/grafana/grafana-json-datasource)](LICENSE)
98

10-
> **Maintenance**: As I'm no longer working at Grafana Labs, nor am I using Grafana where I'm at now, **I'm no longer able to actively maintain this plugin**.
11-
>
12-
> **Update 1:** I'm exploring ways to keep the project going. Check back here to stay updated!
13-
>
14-
> **Update 2:** I'm happy to say that the Grafana team has decided to take over as maintainers of this plugin! 🎉
9+
> **Maintenance**: Now the plugin is being maintained by Grafana Labs. Big thanks to [Marcus Olsson](https://twitter.com/marcusolsson) for the awesome work!
1510
1611
A data source plugin for loading JSON APIs into [Grafana](https://grafana.com) using [JSONPath](https://goessner.net/articles/JsonPath/).
1712

18-
![Screenshot](https://github.com/marcusolsson/grafana-json-datasource/raw/main/src/img/dark.png)
13+
![Screenshot](https://github.com/grafana/grafana-json-datasource/raw/main/src/img/dark.png)
1914

2015
## Documentation
2116

22-
Full documentation for the plugin is available on the [website](https://marcusolsson.github.io/grafana-json-datasource).
17+
Full documentation for the plugin is available on the [website](https://grafana.github.io/grafana-json-datasource).

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "marcusolsson-json-datasource",
3-
"version": "1.3.1",
2+
"name": "grafana-json-datasource",
3+
"version": "1.3.2",
44
"description": "A data source plugin for loading JSON APIs into Grafana",
55
"keywords": [
66
"grafana",
@@ -15,12 +15,11 @@
1515
"sign": "grafana-toolkit plugin:sign"
1616
},
1717
"homepage": "https://grafana.com/plugins/marcusolsson-json-datasource",
18-
"bugs": "https://github.com/marcusolsson/grafana-json-datasource/issues",
19-
"repository": "github:marcusolsson/grafana-json-datasource",
18+
"bugs": "https://github.com/grafana/grafana-json-datasource/issues",
19+
"repository": "github:grafana/grafana-json-datasource",
2020
"author": {
21-
"name": "Marcus Olsson",
22-
"email": "marcus.olsson@hey.com",
23-
"url": "https://marcus.se.net"
21+
"name": "Grafana Labs",
22+
"url": "https://grafana.com"
2423
},
2524
"dependencies": {
2625
"dayjs": "^1.10.4",

0 commit comments

Comments
 (0)