Fork 0
mirror of synced 2024-05-29 21:31:09 -04:00
Commit graph

92 commits

Author SHA1 Message Date
iamlokesh24 af1ce1ddb4
added lookup in init.sls for grafana (#44)
Co-authored-by: Ubuntu <ubuntu@ip-172-31-44-212.ap-south-1.compute.internal>
2022-03-01 14:08:04 +01:00
Marcin 1d8fd0a106
Add user invite max lifetime duration parameter (#43)
* Add option to configure domain and root_url in grafana config

* Add external_image_storage S3 in grafana config

* Revert external_image_storage settings

* Update ldap.toml to work with salt 2018.3

See 8393560642/doc/topics/releases/2018.3.0.rst

* Add recurse option when creating grafana dirs.

Should not hurt if they are empty and can avoid issues when moving data between servers

* Make compatible with Salt 2019.2.0

* Change to items for py3 compat

Signed-off-by: Felipe Zipitria <fzipitria@perceptyx.com>

* Add user_invite_max_lifetime_duration configuration parameter

Co-authored-by: abednarik <alejandro.bednarik@gmail.com>
Co-authored-by: Felipe Zipitria <fzipitria@perceptyx.com>
Co-authored-by: Nicolas Fernandez <nookynet@gmail.com>
2021-10-18 10:21:06 +02:00
Sergio Cambra 3877385b8e fix for python3, items must be used instead of iteritems 2019-10-30 13:01:22 +01:00
Filip Pytloun 4c811e1c02
Merge pull request #39 from syphernl/feature/repo_file
Add (optional) repo to be used
2019-03-04 11:11:53 +01:00
Frank Klaassen 5d6a42172c Add (optional) repo to be used 2019-03-04 08:11:05 +01:00
Frank Klaassen fe63e6756e Make compatible with Salt 2019.2.0 2019-03-04 08:05:32 +01:00
Sébastien Le Ray f155f3c31a server: add support for domain, protocol & root_url 2018-12-11 16:34:16 +01:00
Michal Kobus a4dfe3a0d7 Update keepalived dashboard
Change-Id: I542686b2a92f8fa01fba884c7a829b992e487420
Related-bug: PROD-23880 (PROD:23880)
2018-11-06 15:19:50 +01:00
mcp-jenkins 99e724671f Merge "Change host selection for service" 2018-10-26 15:08:26 +00:00
Michal Kobus 04968e690f Change host selection for service
In case there is no data in heat
check hosts by API status (metric
not related to openstack logs).

Change-Id: Id8805d302fcb95881c6afac2e9e558dbf927c70b
Related-bug: PROD-23976 (PROD:23976)
2018-10-26 14:25:16 +02:00
Mateusz Matuszkowiak 221efb43c5 Splitted Contrail vrouter into v3 and v4 dashboards
Change-Id: I8b3be132e3416dce6e998f03f095efa1fecacf4f
Related-Bug: PROD-24340
2018-10-26 14:21:32 +02:00
mcp-jenkins e2d9068979 Merge "Updated k8s, calico dashboard for MCP infra" 2018-10-25 08:33:45 +00:00
Dmitry Kalashnik 6c91bd6cef Merge "Revert "Add grafana admin password management"" 2018-10-24 13:50:34 +00:00
Dmitry Kalashnik f84a283251 Revert "Add grafana admin password management"
This reverts commit 0bd35ea2f3.

Closes-Bug: PROD-24331
Change-Id: If1cd867e4253fc21ce2af8af1d638aab02bd6855
2018-10-24 13:11:07 +00:00
Mateusz Matuszkowiak 17cdf63803 Updated k8s, calico dashboard for MCP infra
Change-Id: Idaa6abdcbfda2ab143c29ab181cc7917adf47236
Related-Bug: PROD-23900
Related-Bug: PROD-24182
2018-10-24 14:25:46 +02:00
mcp-jenkins f2dd53204f Merge "Add grafana admin password management" 2018-10-17 10:09:50 +00:00
Dmitry Kalashnik 0bd35ea2f3 Add grafana admin password management
Change-Id: Ia706ca4d756ee26b0876bced24d6d961a64cb4ee
Closes-Bug: PROD-17909
2018-10-17 11:59:24 +04:00
Mateusz Matuszkowiak d214cd08b0 Added Edge Main for Edge Cloud monitoring
Change-Id: Ic83d6bb193aa3992eafbc71536966c1c413ff4a8
Closes-Bug: PROD-21828
2018-10-08 15:16:51 +02:00
Mateusz Matuszkowiak bac644f7b5 Fixed some expr when count in use
Change-Id: Ibd097f0b7b60ffd71f862d8125105d4b965a2831
Closes-Bug: PROD-23762
2018-10-08 12:32:26 +02:00
Dmitry Kalashnik 1dc8d94353 Fix expr for per backend sessions
haproxy_scur{sv="BACKEND"} gives you a sum for FORNTEND
Replace with sum per sv with server type

Regex matches 1st group for:


sv_new contains clean hostname

Change-Id: I3143e7f495237bbe688130dd8b73ed0495286b58
Bug-Related: PROD-23548
2018-10-02 17:19:43 +04:00
mcp-jenkins 9cbe044a30 Merge "Add Gnocchi datasource for Grafana" 2018-09-11 12:36:47 +00:00
Michal Kobus 2f77faae7f Add Gnocchi datasource for Grafana
Change-Id: I7a48be1b447b84f672e4462fde29cbe044613acd
Closes-bug: PROD-21747
2018-09-10 14:32:09 +02:00
Ildar Svetlov e48cfec7c1 Add Tenants visualization dashboard
Change-Id: Ibde5b7cafcd79c0da7e72de96dfeb88a3a16236a
Related-PROD: PROD-22819
2018-09-07 13:20:36 +04:00
Dmitry Kalashnik f26ff0fce5 Add all grafana dashboards into grafana formula
Change-Id: Iced67bc96c579883607bd446342132c0873148d7
PROD-Related: PROD-22139
2018-09-04 17:37:51 +04:00
Oleksii Grudev c9af93ce61 Grafana prevent yaml from failing
When including /meta/salt.yml from outside of this
formula the yaml can fail if appropriate pillar elements are not
found. Changing syntax to eliminate this. Including the file
above is needed for generating minion orchestration config
for future use with salt orchestration methods

Change-Id: Ia3fb7eee7c6298d294f641232c8c7e8f8b5806af
Related-PROD: PROD-19973
2018-07-19 12:42:12 +03:00
Michal Kobus a0c95206e5 Dashboard rationalization
Change-Id: Ibc51a3c0839968678e930fbc7b88218988fc0dc2
Closes-bug: PROD-20091
2018-06-21 15:40:35 +02:00
Michal Kobus 758a110fa5 Dashboard rationalization
Change-Id: Id1f7d2719080456bc7ceb168cb32ee6cd4d4a800
Closes-bug: PROD-20082
2018-06-20 14:14:27 +02:00
Ildar Svetlov 2d26b366a1 Rework grafana.client state
- add 'parameters' section loaded from grains to pass parameters
into dashboard template
- pass context into json dashboard template

Change-Id: I5848c315abe6951b5572b4c63db2d847395ae725
Related-PROD: PROD-18535
2018-06-01 15:46:26 +04:00
Ildar Svetlov 52720eb1e5 Change Grafana dashboards since new metrics available
removed IO panel, because there are no io metrics anymore and
this panel is useless;
added general grafana panel with 4 new graphs:
count of organizations,
count of users,
count of playlists,
count of dashboards.

Related-Bug: PROD-18204
Change-Id: I92034621746803ea5e744c1a055d08dd32e71a90
2018-03-06 17:04:59 +04:00
Ildar Svetlov 627cbfddbb Enable Prometheus scraping metrics from Grafana metrics endpoint
Change-Id: Iefa86330cc9f23f7453a79979a8c34adab36a411
Related-Bug: PROD-18204
2018-03-06 15:52:15 +04:00
Martin Polreich 1e62599ad1 Add prometheus main dashboard config
Change-Id: I594ce5914403d2fb7655b69262dfca61bef7cadf
2017-10-18 11:20:10 +00:00
abednarik 2878e14395 Include PID_FILE_DIR config 2017-09-14 11:58:22 -03:00
abednarik cce0a4c3b7 Add pid_file config to defaults file 2017-09-14 11:29:35 -03:00
abednarik 6566e96e22 Ensure custom paths are created and have correct permissions. 2017-08-07 14:30:22 -03:00
abednarik 69e22ffac2 Make grafana paths configurable. 2017-08-04 12:36:22 -03:00
Martin Polreich f91843bc99 Add Grafana dashboard for Prometheus
Change-Id: I6ca11df4fc10b24c9c28dbc77188d73eaace2071
2017-07-26 11:38:13 +00:00
Simon Pasquier f6e5544264 Manage dashboards only for the current datasource
This change adds a new 'datasource' parameter to the dashboard metadata.
This way, the Grafana client state will manage only the dashboards that
match with the deployed datasource (either InfluxDB or Prometheus). For
backward compatibility, the client will always manage the dashboards
that don't set this new parameter.

Change-Id: Iac323d756aff6ca4180f4b648a1d02692ebf292b
2017-05-24 10:33:54 +02:00
Tomáš Kukrál 2127f4e493 fix meta/salt with missing pillar
Change-Id: I714a6ecfe3d4e3014d31bf4009dd3e6fc46bc86e
2017-05-11 20:17:38 +00:00
Ondrej Smola d77f5c70e2 Put collector back to init 2017-05-11 17:10:02 +02:00
Filip Pytloun 3a82ac8bf0 Fix grain structure
Change-Id: Icef4e4aaaadffbd9db81c32108e13d58051106f4
2017-05-11 11:31:11 +02:00
Filip Pytloun 67a022be4f Manage minion.d using support metadata
Change-Id: I37f1c26f8125d98bcbe8d5a105dd5abac9224b36
2017-05-03 15:29:12 +02:00
Swann Croiset 4931237ebc Fixes
Change-Id: I2992d1543bd09542239eefd9fd23434f1f374df2
2017-05-03 15:21:43 +02:00
Ales Komarek a89a9c1065 Merge "Allow to override the datasource name" 2017-05-03 07:59:33 +00:00
Filip Pytloun 44657188cf Manage grains using support metadata
Change-Id: I8ab61330338213b474ec372e911667f7255eafbd
2017-05-02 14:51:01 +02:00
Swann Croiset 9356e26822 Allow to override the datasource name
Change-Id: Ieeeace081771b4840959cceb66b9dea248030482
2017-05-02 14:00:09 +02:00
Ales Komarek 32bf75e7c8 Merge "Add a dashboard to show the uptime of services" 2017-03-24 13:33:43 +00:00
Swann Croiset dd65097f2b Fix the plugin installation
Change-Id: If4c1893ab7068687f597fa406d4a568af143520b
2017-03-21 11:37:56 +01:00
Guillaume Thouvenin f014d23f2d Add a dashboard to show the uptime of services
Change-Id: If7f4cca229b9ebb6fc1a247cc51092126284f80c
2017-03-20 09:28:20 +00:00
Guillaume Thouvenin 22c462b504 Allow the installation of Grafana plugins
Change-Id: I6eab0435fb169ed12c880af01ba1e76a06268825
2017-03-15 10:14:52 +01:00
Olivier Bourdon 308f9e4f0e Fix dashboard for matching environment name
Change-Id: I05ad28a3b10e5ba665f61f495beec3077a0f83eb
2017-02-28 13:13:35 +01:00