diff --git a/layouts/shortcodes/flux/group-key.html b/layouts/shortcodes/flux/group-key.html
index dfdc9f627..68218db10 100644
--- a/layouts/shortcodes/flux/group-key.html
+++ b/layouts/shortcodes/flux/group-key.html
@@ -1,2 +1,3 @@
{{- $groupKey := .Get 0 -}}
-
Group key = {{ $groupKey }}
+{{- $instance := .Get 1 | default false -}}
+
Group key{{ if $instance }} instance{{ end }} = {{ $groupKey }}
diff --git a/layouts/shortcodes/icon.html b/layouts/shortcodes/icon.html
index 5ff2836a1..3eb751b5c 100644
--- a/layouts/shortcodes/icon.html
+++ b/layouts/shortcodes/icon.html
@@ -1,6 +1,10 @@
{{- $_hugo_config := `{ "version": 1 }` -}}
{{- $icon := .Get 0 | default "influx" -}}
-{{- $version := .Get 1 | default "v3" -}}
+{{- $productPathData := findRE "[^/]+.*?" .Page.RelPermalink -}}
+{{- $product := index $productPathData 0 -}}
+{{- $productVersion := index $productPathData 1 | default "v0.0" -}}
+{{- $defaultClockface := cond (isset (index .Site.Data.clockface $product) $productVersion) (index (index .Site.Data.clockface $product) $productVersion) (index (index .Site.Data.clockface $product) "default") }}
+{{- $version := .Get 1 | default $defaultClockface -}}
{{- if eq $version "v2" -}}
{{- if or (eq $icon "nav-admin") (eq $icon "influx") (eq $icon "influx-icon") -}}
@@ -74,55 +78,55 @@
{{- else if eq $icon "toggle-green" -}}
{{- end -}}
-{{- else -}}
+{{- else if eq $version "v3" -}}
{{- if or (eq $icon "nav-admin") (eq $icon "influx") (eq $icon "influx-icon") -}}
-
+
{{- else if or (eq $icon "nav-data-explorer") (eq $icon "data-explorer") (eq $icon "graph") -}}
-
+
{{- else if or (eq $icon "nav-dashboards") (eq $icon "dashboard") (eq $icon "dashboards") -}}
-
+
{{- else if or (eq $icon "nav-tasks") (eq $icon "calendar") (eq $icon "tasks") -}}
-
+
{{- else if or (eq $icon "nav-organizations") (eq $icon "nav-orgs") (eq $icon "orgs") (eq $icon "org") -}}
-
+
{{- else if or (eq $icon "nav-configuration") (eq $icon "nav-config") (eq $icon "wrench") -}}
-
+
{{- else if eq $icon "add-cell" -}}
-
+
{{- else if eq $icon "alert" -}}
-
+
{{- else if or (eq $icon "checkmark") (eq $icon "check") -}}
-
+
{{- else if or (eq $icon "gear") (eq $icon "cog") (eq $icon "settings") (eq $icon "config") -}}
-
+
{{- else if eq $icon "download" -}}
-
+
{{- else if or (eq $icon "duplicate") (eq $icon "copy") (eq $icon "clone") -}}
-
+
{{- else if or (eq $icon "export") (eq $icon "save-as") -}}
-
+
{{- else if or (eq $icon "expand") (eq $icon "fullscreen") -}}
-
+
{{- else if eq $icon "note" -}}
-
+
{{- else if eq $icon "pause" -}}
-
+
{{- else if or (eq $icon "pencil") (eq $icon "edit") -}}
-
+
{{- else if eq $icon "play" -}}
-
+
{{- else if eq $icon "plus" -}}
-
+
{{- else if or (eq $icon "refresh") (eq $icon "replay") -}}
-
+
{{- else if or (eq $icon "remove") (eq $icon "x") -}}
-
+
{{- else if eq $icon "search" -}}
-
+
{{- else if or (eq $icon "trash") (eq $icon "trashcan") (eq $icon "delete") -}}
-
+
{{- else if eq $icon "triangle" -}}
-
+
{{- else if eq $icon "cloud" -}}
{{- else if eq $icon "feedback" -}}
@@ -130,15 +134,15 @@
{{- else if eq $icon "chat" -}}
{{- else if or (eq $icon "eye-open") (eq $icon "eye") (eq $icon "view") -}}
-
+
{{- else if or (eq $icon "eye-closed") (eq $icon "hide") -}}
-
+
{{- else if or (eq $icon "notebook") (eq $icon "notebooks") -}}
-
+
{{- else if eq $icon "crown" -}}
-
+
{{- else if or (eq $icon "bar-chart") (eq $icon "bar-graph") -}}
-
+
{{- else if eq $icon "add-label" -}}
{{- else if or (eq $icon "toggle") (eq $icon "toggle-blue") -}}
@@ -150,16 +154,100 @@
{{- else if or (eq $icon "notebook-add") (eq $icon "notebook-add-cell") -}}
{{- else if or (eq $icon "annotate") (eq $icon "pin") -}}
-
+
{{- else if eq $icon "clock" -}}
-
+
{{- else if or (eq $icon "handle") (eq $icon "move-cell") (eq $icon "move") -}}
-
+
{{- else if eq $icon "share" -}}
-
+
{{- else if eq $icon "bucket" -}}
-
+
{{- else if or (eq $icon "more") (eq $icon "...") (eq $icon "ellipses") -}}
-
+
+ {{- end -}}
+{{- else -}}
+ {{- if or (eq $icon "nav-admin") (eq $icon "influx") (eq $icon "influx-icon") -}}
+
+ {{- else if or (eq $icon "nav-data-explorer") (eq $icon "data-explorer") (eq $icon "graph") -}}
+
+ {{- else if or (eq $icon "nav-dashboards") (eq $icon "dashboard") (eq $icon "dashboards") -}}
+
+ {{- else if or (eq $icon "nav-tasks") (eq $icon "calendar") (eq $icon "tasks") -}}
+
+ {{- else if or (eq $icon "nav-organizations") (eq $icon "nav-orgs") (eq $icon "orgs") (eq $icon "org") -}}
+
+ {{- else if eq $icon "add-cell" -}}
+
+ {{- else if eq $icon "alert" -}}
+
+ {{- else if or (eq $icon "checkmark") (eq $icon "check") -}}
+
+ {{- else if or (eq $icon "gear") (eq $icon "cog") (eq $icon "settings") (eq $icon "config") -}}
+
+ {{- else if eq $icon "download" -}}
+
+ {{- else if or (eq $icon "duplicate") (eq $icon "copy") (eq $icon "clone") -}}
+
+ {{- else if or (eq $icon "export") (eq $icon "save-as") -}}
+
+ {{- else if or (eq $icon "expand") (eq $icon "fullscreen") -}}
+
+ {{- else if eq $icon "note" -}}
+
+ {{- else if eq $icon "pause" -}}
+
+ {{- else if or (eq $icon "pencil") (eq $icon "edit") -}}
+
+ {{- else if eq $icon "play" -}}
+
+ {{- else if eq $icon "plus" -}}
+
+ {{- else if or (eq $icon "refresh") (eq $icon "replay") -}}
+
+ {{- else if or (eq $icon "remove") (eq $icon "x") -}}
+
+ {{- else if eq $icon "search" -}}
+
+ {{- else if or (eq $icon "trash") (eq $icon "trashcan") (eq $icon "delete") -}}
+
+ {{- else if eq $icon "cloud" -}}
+
+ {{- else if eq $icon "feedback" -}}
+
+ {{- else if eq $icon "chat" -}}
+
+ {{- else if or (eq $icon "eye-open") (eq $icon "eye") (eq $icon "view") -}}
+
+ {{- else if or (eq $icon "eye-closed") (eq $icon "hide") -}}
+
+ {{- else if or (eq $icon "notebook") (eq $icon "notebooks") -}}
+
+ {{- else if eq $icon "crown" -}}
+
+ {{- else if or (eq $icon "bar-chart") (eq $icon "bar-graph") -}}
+
+ {{- else if eq $icon "add-label" -}}
+
+ {{- else if or (eq $icon "toggle") (eq $icon "toggle-blue") -}}
+
+ {{- else if eq $icon "toggle-green" -}}
+
+ {{- else if eq $icon "toggle-off" -}}
+
+ {{- else if or (eq $icon "notebook-add") (eq $icon "notebook-add-cell") -}}
+
+ {{- else if or (eq $icon "annotate") (eq $icon "pin") -}}
+
+ {{- else if eq $icon "clock" -}}
+
+ {{- else if or (eq $icon "handle") (eq $icon "move-cell") (eq $icon "move") -}}
+
+ {{- else if eq $icon "share" -}}
+
+ {{- else if eq $icon "bucket" -}}
+
+ {{- else if or (eq $icon "more") (eq $icon "...") (eq $icon "ellipses") -}}
+
{{- end -}}
{{- end -}}
diff --git a/layouts/shortcodes/influxdb/line-protocol.html b/layouts/shortcodes/influxdb/line-protocol.html
new file mode 100644
index 000000000..0eae33039
--- /dev/null
+++ b/layouts/shortcodes/influxdb/line-protocol.html
@@ -0,0 +1,6 @@
+
+
+ measurement , tag11=val1,tag2=val2
+ field1="v1",field2=1i 0000000000000000000
+
+
\ No newline at end of file
diff --git a/layouts/shortcodes/influxdb/points-series.html b/layouts/shortcodes/influxdb/points-series.html
new file mode 100644
index 000000000..fb317d8c3
--- /dev/null
+++ b/layouts/shortcodes/influxdb/points-series.html
@@ -0,0 +1,87 @@
+
+
+
+
+ _time
+ _measurement
+ location
+ _field
+ _value
+
+
+
+
+ 2022-01-01T12:00:00Z
+ weather
+ London, UK
+ temperature
+ 12.0
+
+
+ 2022-02-01T12:00:00Z
+ weather
+ London, UK
+ temperature
+ 12.1
+
+
+ 2022-03-01T12:00:00Z
+ weather
+ London, UK
+ temperature
+ 11.5
+
+
+ 2022-04-01T12:00:00Z
+ weather
+ London, UK
+ temperature
+ 5.9
+
+
+
+
+
+
+
+
+
+ _time
+ _measurement
+ location
+ _field
+ _value
+
+
+
+
+ 2022-01-01T12:00:00Z
+ weather
+ Cologne, DE
+ temperature
+ 13.2
+
+
+ 2022-02-01T12:00:00Z
+ weather
+ Cologne, DE
+ temperature
+ 11.5
+
+
+ 2022-03-01T12:00:00Z
+ weather
+ Cologne, DE
+ temperature
+ 10.2
+
+
+ 2022-04-01T12:00:00Z
+ weather
+ Cologne, DE
+ temperature
+ 7.9
+
+
+
+
\ No newline at end of file
diff --git a/layouts/shortcodes/nav-icon.html b/layouts/shortcodes/nav-icon.html
index 4fb6cc9ac..d8120eca9 100644
--- a/layouts/shortcodes/nav-icon.html
+++ b/layouts/shortcodes/nav-icon.html
@@ -1,5 +1,9 @@
{{ $navIcon := lower (.Get 0) | default "influx" }}
-{{ $version := lower (.Get 1) | default "v3" }}
+{{- $productPathData := findRE "[^/]+.*?" .Page.RelPermalink -}}
+{{- $product := index $productPathData 0 -}}
+{{- $productVersion := index $productPathData 1 | default "v0.0" -}}
+{{- $defaultClockface := cond (isset (index .Site.Data.clockface $product) $productVersion) (index (index .Site.Data.clockface $product) $productVersion) (index (index .Site.Data.clockface $product) "default") }}
+{{- $version := .Get 1 | default $defaultClockface -}}
{{ if eq $version "v2" }}
{{ if or (eq $navIcon "admin") (eq $navIcon "influx") }}
@@ -84,66 +88,93 @@
{{ end }}
{{ else }}
+ {{ if eq $version "v3" }}
- {{/* ----------------------- CLOCKFACE v3 ----------------------- */}}
+ {{/* ----------------------- CLOCKFACE v3 ----------------------- */}}
- {{ if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") (eq $navIcon "explore") }}
- {{ .Scratch.Set "icon" "graphline-2" }}
- {{ .Scratch.Set "title" "Data Explorer" }}
- {{ else if or (eq $navIcon "notebooks") (eq $navIcon "books") }}
- {{ .Scratch.Set "icon" "book-pencil" }}
- {{ .Scratch.Set "title" "Notebooks" }}
- {{ else if or (eq $navIcon "dashboards") (eq $navIcon "boards") }}
- {{ .Scratch.Set "icon" "graph-line-new" }}
- {{ .Scratch.Set "title" "Dashboards" }}
- {{ else if eq $navIcon "tasks" }}
- {{ .Scratch.Set "icon" "calendar" }}
- {{ .Scratch.Set "title" "Tasks" }}
- {{ else if or (eq $navIcon "monitor") (eq $navIcon "alerts") (eq $navIcon "bell") }}
- {{ .Scratch.Set "icon" "bell" }}
- {{ .Scratch.Set "title" "Alerts" }}
- {{ else if or (eq $navIcon "load data") (eq $navIcon "load-data") (eq $navIcon "data") }}
- {{ .Scratch.Set "icon" "ingest-new" }}
- {{ .Scratch.Set "title" "Load Data" }}
- {{ else if eq $navIcon "settings" }}
- {{ .Scratch.Set "icon" "wrench-nav" }}
- {{ .Scratch.Set "title" "Settings" }}
- {{ end }}
+ {{ if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") (eq $navIcon "explore") }}
+ {{ .Scratch.Set "icon" "graphline-2" }}
+ {{ .Scratch.Set "title" "Data Explorer" }}
+ {{ else if or (eq $navIcon "notebooks") (eq $navIcon "books") }}
+ {{ .Scratch.Set "icon" "book-pencil" }}
+ {{ .Scratch.Set "title" "Notebooks" }}
+ {{ else if or (eq $navIcon "dashboards") (eq $navIcon "boards") }}
+ {{ .Scratch.Set "icon" "graph-line-new" }}
+ {{ .Scratch.Set "title" "Dashboards" }}
+ {{ else if eq $navIcon "tasks" }}
+ {{ .Scratch.Set "icon" "calendar" }}
+ {{ .Scratch.Set "title" "Tasks" }}
+ {{ else if or (eq $navIcon "monitor") (eq $navIcon "alerts") (eq $navIcon "bell") }}
+ {{ .Scratch.Set "icon" "bell" }}
+ {{ .Scratch.Set "title" "Alerts" }}
+ {{ else if or (eq $navIcon "load data") (eq $navIcon "load-data") (eq $navIcon "data") }}
+ {{ .Scratch.Set "icon" "ingest-new" }}
+ {{ .Scratch.Set "title" "Load Data" }}
+ {{ else if eq $navIcon "settings" }}
+ {{ .Scratch.Set "icon" "wrench-nav" }}
+ {{ .Scratch.Set "title" "Settings" }}
+ {{ end }}
- {{ if or (eq $navIcon "profile") (eq $navIcon "account") }}
-
{{ else }}
- {{ $icon := .Scratch.Get "icon" }}
- {{ $title := .Scratch.Get "title" }}
-
+
+ {{/* ----------------------- CLOCKFACE v4 ----------------------- */}}
+
+ {{ if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") (eq $navIcon "explore") }}
+ {{ .Scratch.Set "icon" "GraphLine_New" }}
+ {{ .Scratch.Set "title" "Data Explorer" }}
+ {{ else if or (eq $navIcon "notebooks") (eq $navIcon "books") }}
+ {{ .Scratch.Set "icon" "Pencil" }}
+ {{ .Scratch.Set "title" "Notebooks" }}
+ {{ else if or (eq $navIcon "dashboards") (eq $navIcon "boards") }}
+ {{ .Scratch.Set "icon" "DashH" }}
+ {{ .Scratch.Set "title" "Dashboards" }}
+ {{ else if eq $navIcon "tasks" }}
+ {{ .Scratch.Set "icon" "Calendar" }}
+ {{ .Scratch.Set "title" "Tasks" }}
+ {{ else if or (eq $navIcon "monitor") (eq $navIcon "alerts") (eq $navIcon "bell") }}
+ {{ .Scratch.Set "icon" "Bell" }}
+ {{ .Scratch.Set "title" "Alerts" }}
+ {{ else if or (eq $navIcon "load data") (eq $navIcon "load-data") (eq $navIcon "data") }}
+ {{ .Scratch.Set "icon" "Upload_New" }}
+ {{ .Scratch.Set "title" "Load Data" }}
+ {{ else if eq $navIcon "settings" }}
+ {{ .Scratch.Set "icon" "CogOutline_New" }}
+ {{ .Scratch.Set "title" "Settings" }}
+ {{ end }}
{{ end }}
+ {{ if or (eq $navIcon "profile") (eq $navIcon "account") }}
+
+ {{ else }}
+ {{ $icon := .Scratch.Get "icon" }}
+ {{ $title := .Scratch.Get "title" }}
+
+ {{ end }}
{{ end }}
-
diff --git a/layouts/shortcodes/page-nav.html b/layouts/shortcodes/page-nav.html
index 54be778c8..38944e1d3 100644
--- a/layouts/shortcodes/page-nav.html
+++ b/layouts/shortcodes/page-nav.html
@@ -4,11 +4,12 @@
{{ $nextText := .Get "nextText" | default "" }}
{{ $prevPage := .Site.GetPage (replaceRE `\/$` "" $prev) }}
{{ $nextPage := .Site.GetPage (replaceRE `\/$` "" $next) }}
+{{ $keepTab := .Get "keepTab" | default false}}
\ No newline at end of file
diff --git a/layouts/shortcodes/truncate.html b/layouts/shortcodes/truncate.html
index cc51b7e26..e43058fb5 100644
--- a/layouts/shortcodes/truncate.html
+++ b/layouts/shortcodes/truncate.html
@@ -1,6 +1,7 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
-
- {{ .Inner }}
+
+
+ {{ .Inner }}
+
diff --git a/static/fonts/icomoon.eot b/static/fonts/icomoon-v3.eot
similarity index 100%
rename from static/fonts/icomoon.eot
rename to static/fonts/icomoon-v3.eot
diff --git a/static/fonts/icomoon.svg b/static/fonts/icomoon-v3.svg
similarity index 100%
rename from static/fonts/icomoon.svg
rename to static/fonts/icomoon-v3.svg
diff --git a/static/fonts/icomoon.ttf b/static/fonts/icomoon-v3.ttf
similarity index 100%
rename from static/fonts/icomoon.ttf
rename to static/fonts/icomoon-v3.ttf
diff --git a/static/fonts/icomoon.woff b/static/fonts/icomoon-v3.woff
similarity index 100%
rename from static/fonts/icomoon.woff
rename to static/fonts/icomoon-v3.woff
diff --git a/static/fonts/icomoon.woff2 b/static/fonts/icomoon-v3.woff2
similarity index 100%
rename from static/fonts/icomoon.woff2
rename to static/fonts/icomoon-v3.woff2
diff --git a/static/fonts/icomoon-v4.eot b/static/fonts/icomoon-v4.eot
new file mode 100644
index 000000000..c9a1588b7
Binary files /dev/null and b/static/fonts/icomoon-v4.eot differ
diff --git a/static/fonts/icomoon-v4.ttf b/static/fonts/icomoon-v4.ttf
new file mode 100644
index 000000000..64416d44f
Binary files /dev/null and b/static/fonts/icomoon-v4.ttf differ
diff --git a/static/fonts/icomoon-v4.woff b/static/fonts/icomoon-v4.woff
new file mode 100644
index 000000000..65f3034fc
Binary files /dev/null and b/static/fonts/icomoon-v4.woff differ
diff --git a/static/fonts/icomoon-v4.woff2 b/static/fonts/icomoon-v4.woff2
new file mode 100644
index 000000000..a3ee077ab
Binary files /dev/null and b/static/fonts/icomoon-v4.woff2 differ
diff --git a/static/fonts/iconmoon-v4.svg b/static/fonts/iconmoon-v4.svg
new file mode 100644
index 000000000..1b8ba5422
--- /dev/null
+++ b/static/fonts/iconmoon-v4.svg
@@ -0,0 +1,98 @@
+
+
+
+Generated by IcoMoon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/img/influxdb/2-4-get-started-visualize-query-builder.png b/static/img/influxdb/2-4-get-started-visualize-query-builder.png
new file mode 100644
index 000000000..1ce6383e9
Binary files /dev/null and b/static/img/influxdb/2-4-get-started-visualize-query-builder.png differ
diff --git a/static/img/influxdb/2-4-get-started-visualize-time-range.png b/static/img/influxdb/2-4-get-started-visualize-time-range.png
new file mode 100644
index 000000000..46ccc7d33
Binary files /dev/null and b/static/img/influxdb/2-4-get-started-visualize-time-range.png differ
diff --git a/static/img/influxdb/2-4-get-started-visualize-variable-select.png b/static/img/influxdb/2-4-get-started-visualize-variable-select.png
new file mode 100644
index 000000000..a5b25b073
Binary files /dev/null and b/static/img/influxdb/2-4-get-started-visualize-variable-select.png differ