openstack/monasca-ui
Code Issues Proposed changes

Merge "Change policy file format to yaml"

Browse Source
This commit is contained in:
Zuul 2022-02-03 09:51:08 +00:00 committed by Gerrit Code Review
commit 75f1f95bba
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.rst
View File

@ -34,8 +34,8 @@ Devstack Deployment Set Up
ln -sf $(pwd)/../monasca-ui/monitoring/enabled/_50_admin_add_monitoring_panel.py \ ln -sf $(pwd)/../monasca-ui/monitoring/enabled/_50_admin_add_monitoring_panel.py \
$(pwd)/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py $(pwd)/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py
ln -sf $(pwd)/../monasca-ui/monitoring/conf/monitoring_policy.json \ ln -sf $(pwd)/../monasca-ui/monitoring/conf/monitoring_policy.yaml \
$(pwd)/openstack_dashboard/conf/monitoring_policy.json $(pwd)/openstack_dashboard/conf/monitoring_policy.yaml
ln -sfF $(pwd)/../monasca-ui/monitoring $(pwd)/monitoring ln -sfF $(pwd)/../monasca-ui/monitoring $(pwd)/monitoring
- Collect static files, run tests - Collect static files, run tests
@ -89,8 +89,8 @@ Set up Monasca-UI
ln -sf $(pwd)/../monasca-ui/monitoring/enabled/_50_admin_add_monitoring_panel.py \ ln -sf $(pwd)/../monasca-ui/monitoring/enabled/_50_admin_add_monitoring_panel.py \
$(pwd)/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py $(pwd)/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py
ln -sf $(pwd)/../monasca-ui/monitoring/conf/monitoring_policy.json \ ln -sf $(pwd)/../monasca-ui/monitoring/conf/monitoring_policy.yaml \
$(pwd)/openstack_dashboard/conf/monitoring_policy.json $(pwd)/openstack_dashboard/conf/monitoring_policy.yaml
ln -sfF $(pwd)/../monasca-ui/monitoring $(pwd)/monitoring ln -sfF $(pwd)/../monasca-ui/monitoring $(pwd)/monitoring
./run_tests #load monasca-client into virtualenv ./run_tests #load monasca-client into virtualenv

8
monitoring/conf/monitoring_policy.json
View File

@ -1,8 +0,0 @@
{
"monasca_user_role": "role:monasca-user",
"default": "@",
"monitoring:monitoring": "rule:monasca_user_role",
"monitoring:kibana_access": "rule:monasca_user_role"
}

4
monitoring/conf/monitoring_policy.yaml Normal file
View File

@ -0,0 +1,4 @@
"monasca_user_role": "role:monasca-user"
"default": "@"
"monitoring:monitoring": "rule:monasca_user_role"
"monitoring:kibana_access": "rule:monasca_user_role"

2
monitoring/config/local_settings.py
View File

@ -117,5 +117,5 @@ OPENSTACK_SSL_NO_VERIFY = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
OPENSTACK_SSL_CACERT = getattr(settings, 'OPENSTACK_SSL_CACERT', None) OPENSTACK_SSL_CACERT = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
POLICY_FILES = getattr(settings, 'POLICY_FILES', {}) POLICY_FILES = getattr(settings, 'POLICY_FILES', {})
POLICY_FILES.update({'monitoring': 'monitoring_policy.json',}) # noqa POLICY_FILES.update({'monitoring': 'monitoring_policy.yaml',}) # noqa
setattr(settings, 'POLICY_FILES', POLICY_FILES) setattr(settings, 'POLICY_FILES', POLICY_FILES)