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.

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

feat(geo-widget): backend storage implementation for geo widget #19811

Merged
merged 27 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
42085b2
feat(geo-widget): backend storage implementation for chronograf geo w…
dubsky Oct 23, 2020
080fb8f
Merge branch 'master' of github.com:influxdata/influxdb into feat/geo…
dubsky Oct 26, 2020
c42c81f
fix: formatting & swagger go compatibility check
dubsky Oct 26, 2020
b268e33
fix: update http/swagger.yml formatting
dubsky Oct 26, 2020
74d2ee4
Merge branch 'master' of github.com:influxdata/influxdb into feat/geo…
dubsky Oct 30, 2020
ac43ba9
fix: inconsistent required property
dubsky Oct 30, 2020
83c4c1d
Merge remote-tracking branch 'origin/feat/geo-widget-backend' into fe…
dubsky Oct 30, 2020
33efc5c
test: verify geo configuration serialization
dubsky Nov 9, 2020
b8356bd
feat(geo-widget): pkger support added
dubsky Nov 25, 2020
3f1ab02
Merge branch 'master' into feat/geo-widget-backend
ivankudibal Dec 18, 2020
05b9701
feat(geo-widget): backend storage implementation for chronograf geo w…
dubsky Oct 23, 2020
2304ce3
fix: formatting & swagger go compatibility check
dubsky Oct 26, 2020
5fe1825
fix: update http/swagger.yml formatting
dubsky Oct 26, 2020
780af91
fix: inconsistent required property
dubsky Oct 30, 2020
affbc48
test: verify geo configuration serialization
dubsky Nov 9, 2020
c31b45c
feat(geo-widget): pkger support added
dubsky Nov 25, 2020
e211d8f
Merge branch 'feat/geo-widget-backend' of github.com:dubsky/influxdb …
ivankudibal Dec 18, 2020
a9dc6c6
build: save cache and artifacts after gotest in CI (#20370)
danxmoran Dec 18, 2020
a9e0e5a
fix(cmd/influx): improve CLI error returned on org-not-found (#20387)
danxmoran Dec 21, 2020
c67ecc4
fix: don't duplicate text in task errors (#20380)
danxmoran Dec 21, 2020
ade3008
refactor: simplify how we set the top-level influxd logger (#20374)
danxmoran Dec 21, 2020
fb8def2
Merge branch 'master' into feat/geo-widget-backend
dubsky Dec 22, 2020
a22b4e1
Merge branch 'master' into feat/geo-widget-backend
dubsky Jan 8, 2021
4e60fdf
Merge branch 'master' into feat/geo-widget-backend
ivankudibal Jan 11, 2021
ba33d29
Merge branch 'master' into feat/geo-widget-backend
dubsky Jan 12, 2021
f8452d5
Merge branch 'master' into feat/geo-widget-backend
ivankudibal Jan 13, 2021
7827a11
Merge branch 'master' into feat/geo-widget-backend
danxmoran Jan 13, 2021
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
Prev Previous commit
Next Next commit
fix: formatting & swagger go compatibility check
  • Loading branch information
dubsky authored and ivankudibal committed Dec 18, 2020
commit 2304ce30f9aa633a87b722f1664c923b7c1972bc
65 changes: 33 additions & 32 deletions dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ func MarshalViewPropertiesJSON(v ViewProperties) ([]byte, error) {
Shape string `json:"shape"`
GeoViewProperties
}{
Shape: "chronograf-v2",
Shape: "chronograf-v2",
GeoViewProperties: vis,
}
case XYViewProperties:
Expand Down Expand Up @@ -968,44 +968,45 @@ type GaugeViewProperties struct {

// Geographical coordinates
type Datum struct {
Lat float64 `json:"lat"`
Lon float64 `json:"lon"`
Lat float64 `json:"lat"`
Lon float64 `json:"lon"`
}

// Single visualization layer properties of a chronograf map widget
type GeoLayer struct {
Type string `json:"type"`
RadiusField string `json:"radiusField"`
ColorField string `json:"colorField"`
IntensityField string `json:"intensityField"`
// circle layer properties
ViewColors []ViewColor `json:"colors"`
Radius int32 `json:"radius"`
Blur int32 `json:"blur"`
RadiusDimension Axis `json:"radiusDimension"`
ColorDimension Axis `json:"colorDimension"`
IntensityDimension Axis `json:"intensityDimension"`
InterpolateColors bool `json:"interpolateColors"`
// track layer properties
TrackWidth int32 `json:"trackWidth"`
Speed int32 `json:"speed"`
RandomColors bool `json:"randomColors"`
// point layer properties
IsClustered bool `json:"isClustered"`
Type string `json:"type"`
RadiusField string `json:"radiusField"`
ColorField string `json:"colorField"`
IntensityField string `json:"intensityField"`
// circle layer properties
ViewColors []ViewColor `json:"colors"`
Radius int32 `json:"radius"`
Blur int32 `json:"blur"`
RadiusDimension Axis `json:"radiusDimension"`
ColorDimension Axis `json:"colorDimension"`
IntensityDimension Axis `json:"intensityDimension"`
InterpolateColors bool `json:"interpolateColors"`
// track layer properties
TrackWidth int32 `json:"trackWidth"`
Speed int32 `json:"speed"`
RandomColors bool `json:"randomColors"`
// point layer properties
IsClustered bool `json:"isClustered"`
}

// GeoViewProperties represents options for map view in Chronograf
type GeoViewProperties struct {
Type string `json:"type"`
Queries []DashboardQuery `json:"queries"`
Center Datum `json:"center"`
Zoom float64 `json:"zoom"`
MapStyle string `json:"mapStyle"`
AllowPanAndZoom bool `json:"allowPanAndZoom"`
DetectCoordinateFields bool `json:"detectCoordinateFields"`
ViewColor []ViewColor `json:"colors"`
GeoLayers []GeoLayer `json:"layers"`
Note string `json:"note"`
ShowNoteWhenEmpty bool `json:"showNoteWhenEmpty"`
Type string `json:"type"`
Queries []DashboardQuery `json:"queries"`
Center Datum `json:"center"`
Zoom float64 `json:"zoom"`
MapStyle string `json:"mapStyle"`
AllowPanAndZoom bool `json:"allowPanAndZoom"`
DetectCoordinateFields bool `json:"detectCoordinateFields"`
ViewColor []ViewColor `json:"colors"`
GeoLayers []GeoLayer `json:"layers"`
Note string `json:"note"`
ShowNoteWhenEmpty bool `json:"showNoteWhenEmpty"`
}

// TableViewProperties represents options for table view in Chronograf
Expand Down
7 changes: 2 additions & 5 deletions http/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9781,10 +9781,6 @@ components:
type:
type: string
enum: [ heatmap, circleMap, pointMap, trackMap]
dubsky marked this conversation as resolved.
Show resolved Hide resolved
FieldLegendProperties:
type: object
properties:
label: string
GeoCircleViewLayer:
allOf:
- $ref: "#/components/schemas/GeoViewLayerProperties"
Expand Down Expand Up @@ -9902,7 +9898,8 @@ components:
format: double
zoom:
description: Zoom level used for initial display of the map
type: float64
type: number
format: double
minimum: 1
maximum: 28
allowPanAndZoom:
Expand Down