Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
cb61eab
Add satellite map
svet-b Nov 20, 2018
79e75b0
Tweak look of desaturated image
svet-b Nov 20, 2018
1ae1541
Edit Esri sources label
svet-b Nov 20, 2018
b7896ce
Add missing dev dependencies
amotl Dec 17, 2018
6c63d85
Add new mapping options "table+json" and "table+jsonp" to retrieve
amotl Dec 17, 2018
b665370
Disable auto panning to fit popup
amotl Apr 19, 2019
04bcb59
Add “autoPanLabels” and “autoWidthLabels” to visual option settings
amotl Apr 20, 2019
1fe77a3
Add Makefile for macOS/Homebrew
amotl Apr 20, 2019
03352c7
Add “zoomControl” and “attributionControl” to visual option settings
amotl Apr 20, 2019
a11cee0
Optionally display legend in different DOM element
amotl Apr 20, 2019
08828ad
Increase form field width for JSON endpoint url settings
amotl Apr 20, 2019
8206c87
Improve consistency in settings editor
amotl Apr 20, 2019
e03297a
Add software tests for options
amotl Apr 20, 2019
8597951
Update changelog
amotl Apr 20, 2019
a2c9467
Release 0.3.0-dev2
amotl Apr 20, 2019
0eb53f2
Release 0.3.0-dev2
amotl Apr 20, 2019
c42fde1
fixed light theme labels text color #169
dtheb Apr 8, 2019
4c54959
Release 0.3.0-dev3
amotl Apr 24, 2019
09432e8
Add Clickthrough URL option for country circles
ryft Mar 7, 2018
129dd98
Adds clickthrough links mappable from data for circles
lha-wd Apr 1, 2019
5b54263
Update changelog
amotl Apr 27, 2019
7a2e825
Combine both clickthrough link implementations #129 and #190
amotl Apr 27, 2019
df86b0d
Use the regular Grafana templating mechanism for interpolating variables
amotl Apr 27, 2019
68290d6
Clean up `DataFormatter.setTableValues()`, add inline comments
amotl Apr 27, 2019
f9fdad7
Apply Grafana-style variable interpolation to _all_ panel settings.
amotl Apr 28, 2019
fe1bb06
Put all request parameters from url into the variable
amotl Apr 28, 2019
ec37a62
Use request parameters prefixed with "panel-" to optionally override
amotl Apr 28, 2019
ed89c4a
Improve map center control handling
amotl Apr 28, 2019
162a299
Improve clickthroughURL interpolation
amotl Apr 28, 2019
0d9d091
Add panel control option `clickthroughOptions.windowName`
amotl Apr 28, 2019
49791b5
Improve centering on “Last Geohash”
amotl Apr 28, 2019
ef578ce
Add first geohash center support
fabienpomerol Aug 21, 2018
ebec3f6
Add control options `mapFitData` and `mapZoomByRadius`.
amotl Apr 29, 2019
a73dbe5
Start repainting the user interface.
amotl May 1, 2019
6d7f99e
Finish repainting the user interface.
amotl May 5, 2019
09c5f33
Add options `ignoreEmptyGeohashValues` and `ignoreInvalidGeohashValues`.
amotl May 5, 2019
3080e3a
Add backlog
amotl May 5, 2019
88e5bdd
Update documentation
amotl May 5, 2019
eea48c4
Add `ignoreEscapeKey` option.
amotl May 5, 2019
e379a8b
Add `hideTimepickerNavigation` option.
amotl May 6, 2019
4f5ea4f
Add `circleOptions.strokeEnabled` and `circleOptions.strokeWeight`
amotl May 6, 2019
cf1f80a
Add options `customAttribution` and `customAttributionText`.
amotl May 6, 2019
233efa9
Update backlog
amotl May 6, 2019
ef40c98
Update changeling
amotl May 6, 2019
3c06807
Release 0.3.0-dev4
amotl May 6, 2019
92fdfa5
Groom changelog
amotl May 6, 2019
02ec0b6
Fix tests
amotl May 6, 2019
7a2ccab
Rename "point_" prefix to "__field_" when interpolating datapoint fie…
amotl May 10, 2019
b59effc
Update documentation
amotl May 10, 2019
a888d95
Improve wording and sort order of predefined locations
amotl May 10, 2019
6e1d234
Release 0.3.0-dev5
amotl May 10, 2019
84f23cb
Merge Hiveeyes version
svet-b May 14, 2019
7ff9ba3
Add Esri Satellite and HERE Hybrid basemaps
svet-b May 15, 2019
9da0164
Built version
svet-b May 15, 2019
20150a2
Remove automatic key suffix for popover texts
amotl May 21, 2019
416335f
Limit effective zoom level by new "Maximum zoom level" option
amotl May 21, 2019
a6234c0
Update backlog
amotl May 21, 2019
ceeb18c
Bump version
amotl May 21, 2019
501b2ef
Release 0.3.0-dev6
amotl May 21, 2019
4e271fe
Fix transformation machinery for data in timeseries format, see #3.
amotl Jun 1, 2019
713c8ca
Acquire location data again after being cleared out
amotl Jun 1, 2019
7166343
Release 0.3.0-dev7
amotl Jun 1, 2019
ca62cd7
Improve initialisation and refresh behaviour
amotl Jun 1, 2019
6fe1a1a
Release 0.3.0-dev8
amotl Jun 1, 2019
3b86a49
Adjust software tests
amotl Jun 1, 2019
f79d2d2
Release 0.3.0-dev9
amotl Jun 1, 2019
1e6eac2
Merge tag '0.3.0-dev9' into ammp_0.3.0-dev9
svet-b Jul 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules
npm-debug.log
.DS_Store
.vscode
.idea
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
# Changelog

## v0.3.0-dev

- Add new mapping options `table+json` and `table+jsonp` to retrieve
location information from JSON endpoint, even for table data.
The lookup key is the value obtained from the database field
designated by `tableQueryOptions.labelLocationKeyField`.
- Add `autoPanLabels` and `autoWidthLabels` to visual option settings.
- Add `zoomControl` and `attributionControl` to visual option settings.
- Optionally display legend in different DOM element.
- Increase form field width for JSON endpoint url settings.
- Fix conditional table options display in settings editor.
- Add `showTableOptions()` conditional for signalling any type of table source.
- Add software tests covering new control options
- `locationData: "table+json"`
- `showZoomControl: false`
- `showAttribution: false`
- `legendContainerSelector`
- Add `Makefile` for macOS/Homebrew.
- Fix popover labels text color for light theme ([#169](https://github.com/grafana/worldmap-panel/issues/169)).
Thanks, [@dtheb](https://github.com/dtheb).
- Add clickthrough option for circles, use fixed url ([#129](https://github.com/grafana/worldmap-panel/pull/129)).
Thanks, [@ryft](https://github.com/ryft).
- Add clickthrough option for circles, use urls from data ([#190](https://github.com/grafana/worldmap-panel/pull/190)).
Thanks, [@leonhardhaas](https://github.com/leonhardhaas).
- Combine both clickthrough link implementations #129 and #190,
add basic variable interpolation based on keys from `dataPoint`.
- Introduce the regular Grafana templating mechanism for interpolating variables
into clickthrough links. As we are now interpolating dashboard **and** `dataPoint`
variables, the latter one will get prefixed with `__field_` to avoid collisions.
- Apply Grafana-style variable interpolation to **all** panel settings.
- Add query parameters into the interpolation dictionary, prefixed by `request_`.
- Use request parameters prefixed with "panel-" to optionally override the
respective control options.
- Improve map center control handling.
- Improve `clickthroughUrl` interpolation.
- Add control option `clickthroughOptions.windowName` to open clickthrough target in designated window.
- Improve centering on `Last Geohash`.
- Add support for `First Geohash` centering ([#156](https://github.com/grafana/worldmap-panel/pull/156)).
Thanks, [@fabienpomerol](https://github.com/fabienpomerol).
- Add control options `mapFitData` and `mapZoomByRadius`.
- Repaint user interface.
- Refactor machinery and user interface.
- Add options `ignoreEmptyGeohashValues` and `ignoreInvalidGeohashValues`.
- Add `ignoreEscapeKey` option.
- Add `hideTimepickerNavigation` option.
- Add `circleOptions.strokeEnabled` and `circleOptions.strokeWeight`.
- Add options `customAttribution` and `customAttributionText`.
- Rename `point_` prefix to `__field_` when interpolating datapoint field values
- Remove automatic key suffix for popover texts
- Limit effective zoom level by new "Maximum zoom level" option
- Fix transformation machinery for data in timeseries format
- Acquire location data again after being cleared out when hitting an empty dataset
- Improve initialisation and refresh behaviour

## v0.2.0

- Convert to TypeScript, webpack and Jest
- Use Yarn on CircleCI
- Add missing dev dependencies
- Tweak for incorrect height on render
which occurs more frequently in Grafana 6.0

## v0.1.2

- Map centering ignores configured location [#149](https://github.com/grafana/worldmap-panel/issues/149) Thanks [@clompsy](https://github.com/clompsy)
Expand Down
7 changes: 7 additions & 0 deletions Makefile.Homebrew
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# brew install grafana

grafana-start:
grafana-server --config=/usr/local/etc/grafana/grafana.ini --homepath /usr/local/share/grafana cfg:default.paths.logs=/usr/local/var/log/grafana cfg:default.paths.data=/usr/local/var/lib/grafana cfg:default.paths.plugins=/usr/local/var/lib/grafana/plugins

link-plugin:
ln -s `pwd` /usr/local/var/lib/grafana/plugins/
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Worldmap Panel Plugin for Grafana

**The [Grafana Worldmap Panel 0.3.0-dev series] ([changes]) is a work in progress, please don't use it in production yet. We are happy for testing and feedback.**

[Grafana Worldmap Panel 0.3.0-dev series]: https://github.com/hiveeyes/grafana-worldmap-panel
[changes]: https://github.com/hiveeyes/grafana-worldmap-panel/blob/develop/CHANGELOG.md

The Worldmap Panel is a tile map of the world that can be overlaid with circles representing data points from a query. It can be used with time series metrics, with geohash data from Elasticsearch or data in the Table format.

![Worldmap](https://raw.githubusercontent.com/grafana/worldmap-panel/54f83cfdc7339fee02df00933422c35630677330/src/images/worldmap-world.png)
Expand Down Expand Up @@ -208,7 +213,7 @@ Supported Databases:

- Warp 10 via [grafana-warp10-datasource](https://github.com/cityzendata/grafana-warp10) plugin

It supports any datasource capable of generating a JSON response with a a custom list of locations (the same format that for the JSON enpoint).
It supports any datasource capable of generating a JSON response with a custom list of locations (the same format that for the JSON endpoint).

### Map Data Options

Expand Down
62 changes: 62 additions & 0 deletions dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
# Changelog

## v0.3.0-dev

- Add new mapping options `table+json` and `table+jsonp` to retrieve
location information from JSON endpoint, even for table data.
The lookup key is the value obtained from the database field
designated by `tableQueryOptions.labelLocationKeyField`.
- Add `autoPanLabels` and `autoWidthLabels` to visual option settings.
- Add `zoomControl` and `attributionControl` to visual option settings.
- Optionally display legend in different DOM element.
- Increase form field width for JSON endpoint url settings.
- Fix conditional table options display in settings editor.
- Add `showTableOptions()` conditional for signalling any type of table source.
- Add software tests covering new control options
- `locationData: "table+json"`
- `showZoomControl: false`
- `showAttribution: false`
- `legendContainerSelector`
- Add `Makefile` for macOS/Homebrew.
- Fix popover labels text color for light theme ([#169](https://github.com/grafana/worldmap-panel/issues/169)).
Thanks, [@dtheb](https://github.com/dtheb).
- Add clickthrough option for circles, use fixed url ([#129](https://github.com/grafana/worldmap-panel/pull/129)).
Thanks, [@ryft](https://github.com/ryft).
- Add clickthrough option for circles, use urls from data ([#190](https://github.com/grafana/worldmap-panel/pull/190)).
Thanks, [@leonhardhaas](https://github.com/leonhardhaas).
- Combine both clickthrough link implementations #129 and #190,
add basic variable interpolation based on keys from `dataPoint`.
- Introduce the regular Grafana templating mechanism for interpolating variables
into clickthrough links. As we are now interpolating dashboard **and** `dataPoint`
variables, the latter one will get prefixed with `__field_` to avoid collisions.
- Apply Grafana-style variable interpolation to **all** panel settings.
- Add query parameters into the interpolation dictionary, prefixed by `request_`.
- Use request parameters prefixed with "panel-" to optionally override the
respective control options.
- Improve map center control handling.
- Improve `clickthroughUrl` interpolation.
- Add control option `clickthroughOptions.windowName` to open clickthrough target in designated window.
- Improve centering on `Last Geohash`.
- Add support for `First Geohash` centering ([#156](https://github.com/grafana/worldmap-panel/pull/156)).
Thanks, [@fabienpomerol](https://github.com/fabienpomerol).
- Add control options `mapFitData` and `mapZoomByRadius`.
- Repaint user interface.
- Refactor machinery and user interface.
- Add options `ignoreEmptyGeohashValues` and `ignoreInvalidGeohashValues`.
- Add `ignoreEscapeKey` option.
- Add `hideTimepickerNavigation` option.
- Add `circleOptions.strokeEnabled` and `circleOptions.strokeWeight`.
- Add options `customAttribution` and `customAttributionText`.
- Rename `point_` prefix to `__field_` when interpolating datapoint field values
- Remove automatic key suffix for popover texts
- Limit effective zoom level by new "Maximum zoom level" option
- Fix transformation machinery for data in timeseries format
- Acquire location data again after being cleared out when hitting an empty dataset
- Improve initialisation and refresh behaviour

## v0.2.0

- Convert to TypeScript, webpack and Jest
- Use Yarn on CircleCI
- Add missing dev dependencies
- Tweak for incorrect height on render
which occurs more frequently in Grafana 6.0

## v0.1.2

- Map centering ignores configured location [#149](https://github.com/grafana/worldmap-panel/issues/149) Thanks [@clompsy](https://github.com/clompsy)
Expand Down
7 changes: 6 additions & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Worldmap Panel Plugin for Grafana

**The [Grafana Worldmap Panel 0.3.0-dev series] ([changes]) is a work in progress, please don't use it in production yet. We are happy for testing and feedback.**

[Grafana Worldmap Panel 0.3.0-dev series]: https://github.com/hiveeyes/grafana-worldmap-panel
[changes]: https://github.com/hiveeyes/grafana-worldmap-panel/blob/develop/CHANGELOG.md

The Worldmap Panel is a tile map of the world that can be overlaid with circles representing data points from a query. It can be used with time series metrics, with geohash data from Elasticsearch or data in the Table format.

![Worldmap](https://raw.githubusercontent.com/grafana/worldmap-panel/54f83cfdc7339fee02df00933422c35630677330/src/images/worldmap-world.png)
Expand Down Expand Up @@ -208,7 +213,7 @@ Supported Databases:

- Warp 10 via [grafana-warp10-datasource](https://github.com/cityzendata/grafana-warp10) plugin

It supports any datasource capable of generating a JSON response with a a custom list of locations (the same format that for the JSON enpoint).
It supports any datasource capable of generating a JSON response with a custom list of locations (the same format that for the JSON endpoint).

### Map Data Options

Expand Down
Loading