Fork 0
Commit Graph

154 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
Filip Pytloun b863646e71
Merge pull request #42 from scambra/patch-python3
fix for python3, items must be used instead of iteritems
2019-10-30 13:19:30 +01: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
Filip Pytloun 60dc411a5e
Merge pull request #38 from syphernl/feature/salt_2019.2
Make compatible with Salt 2019.2.0
2019-03-04 11:10:51 +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
Filip Pytloun 72c889639c
Merge pull request #36 from beuss/master
server: add support for domain, protocol & root_url
2018-12-12 12:11:05 +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
Dmitry Kalashnik 23248a862c Fix dashboards metadata
Closes-Bug: PROD-23514

Change-Id: I17395c2a9a46d6526b707e2466482018170429fc
2018-09-28 17:12:50 +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
Ondrej Smola 1973172e8a Merge "Add unit tests" 2018-07-19 13:43:32 +00: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
Martin Polreich bafd257298 Add unit tests
Change-Id: I6530d29e834633665f21e330d23fd50471ce0046
2018-07-17 15:45:00 +02: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
Petr Michalec d1d13a4c1f
Merge pull request #32 from Morsicus/dev/fix_readme_sqlite
fix readme engine database sqlite3
2018-05-22 09:45:36 +02:00
Mickaël Fortunato f0d262c31a fix readme engine database sqlite3 2018-05-07 14:27:13 +02:00
Petr Michalec 64925dfbb4
Update metadata.yml with correct URL
Change-Id: I10085556e7fc54c279ac42c2daa8b1397773cfa3
2018-03-29 08:33:01 +02: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
Filip Pytloun 15bdc66d02 Update Makefile 2018-02-15 15:13:12 +01:00
Petr Michalec f4dd16dba1
Remove salt-master, reclass from pkg dependencis
Change-Id: Ia0fe0d452dacff08fef12e9df6a893ec368384cd
2018-01-09 09:35:54 +01:00
Martin Polreich 1e62599ad1 Add prometheus main dashboard config
Change-Id: I594ce5914403d2fb7655b69262dfca61bef7cadf
2017-10-18 11:20:10 +00:00
Petr Michalec 75438bf474 Merge pull request #30 from Perceptyx/master
Add default file and custom path dir creation
2017-09-19 10:57:16 +02:00
Alejandro Bednarik 1aab527af3 Merge pull request #5 from Perceptyx/pid_file_dir
Include PID_FILE_DIR config
2017-09-14 11:59:05 -03:00
abednarik 2878e14395 Include PID_FILE_DIR config 2017-09-14 11:58:22 -03:00
Alejandro Bednarik 698c59aa66 Merge pull request #4 from Perceptyx/pid_file_config
Add pid_file config to defaults file
2017-09-14 11:31:24 -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