Skip to content

Commit

Permalink
Added ability to configure default selected time interval (#97)
Browse files Browse the repository at this point in the history
  • Loading branch information
@akoutmos
akoutmos authored Sep 3, 2021
1 parent b412af5 commit e74e6e5
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 57 deletions.
3 changes: 2 additions & 1 deletion lib/mix/tasks/prom_ex.gen.config.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ defmodule Mix.Tasks.PromEx.Gen.Config do
@impl true
def dashboard_assigns do
[
datasource_id: "<%= @datasource_id %>"
datasource_id: "<%= @datasource_id %>",
default_selected_interval: "30s"
]
end
Expand Down
4 changes: 4 additions & 0 deletions lib/prom_ex/dashboard_renderer.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ defmodule PromEx.DashboardRenderer do

defp default_plugin_assigns(otp_app) do
[
# View defaults
default_selected_interval: "30s",

# Metrics prefix defaults
absinthe_metric_prefix: "#{otp_app}_prom_ex_absinthe",
application_metric_prefix: "#{otp_app}_prom_ex_application",
beam_metric_prefix: "#{otp_app}_prom_ex_beam",
Expand Down
14 changes: 7 additions & 7 deletions priv/absinthe.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1732,37 +1732,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/beam.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2256,37 +2256,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/ecto.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,37 +1034,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/oban.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2816,37 +2816,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/phoenix.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1649,37 +1649,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/phoenix_live_view.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1322,37 +1322,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/plug_cowboy.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,37 +1164,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down
14 changes: 7 additions & 7 deletions priv/plug_router.json.eex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,37 +1164,37 @@
"name": "interval",
"options": [
{
"selected": false,
"selected": <%= @default_selected_interval == "15s" %>,
"text": "15s",
"value": "15s"
},
{
"selected": true,
"selected": <%= @default_selected_interval == "30s" %>,
"text": "30s",
"value": "30s"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1m" %>,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "5m" %>,
"text": "5m",
"value": "5m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "15m" %>,
"text": "15m",
"value": "15m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "30m" %>,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"selected": <%= @default_selected_interval == "1h" %>,
"text": "1h",
"value": "1h"
}
Expand Down

0 comments on commit e74e6e5

Please sign in to comment.