Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports needed for gnocchi #1

Merged
merged 14 commits into from Aug 29, 2018
Merged

Backports needed for gnocchi #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
83ecb4b
Replace the Gnocchi dispatcher by a publisher
jd Sep 4, 2017
94684ad
Replace jsonutils by ujson
jd Oct 18, 2017
68320fa
simplify cache generation
chungg Nov 23, 2017
18992ab
Replace ujson with json
javacruft Jan 3, 2018
d85e3b3
use hashmap to quickly find matching resource def
chungg Nov 23, 2017
e396f24
compute sample as dictionary once
chungg Nov 24, 2017
7c97a58
fix gnocchi stats logging
chungg Nov 24, 2017
8bc0774
simplify gnocchi batch push setup
chungg Nov 25, 2017
97eb7f7
Cached should not be used when creating gnocchi resources
xuqiankun Nov 30, 2017
86ad9b3
set cache with attributes only
chungg Jan 30, 2018
e92fe98
gnocchi: configure archive policies on Ceilo side
Jan 3, 2018
e3252eb
Don't use gnocchiclient during publisher init
Mar 1, 2018
674a4ff
fix gnocchi publisher
chungg Oct 17, 2017
e9c65b1
gnocchi: don't create metrics with resource
sileht Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions ceilometer/api/controllers/v2/root.py
View file
Open in desktop
Expand Up @@ -121,10 +121,6 @@ def gnocchi_is_enabled(self):
if pecan.request.cfg.api.gnocchi_is_enabled is not None:
self._gnocchi_is_enabled = (
pecan.request.cfg.api.gnocchi_is_enabled)

elif ("gnocchi" not in pecan.request.cfg.meter_dispatchers
or "database" in pecan.request.cfg.meter_dispatchers):
self._gnocchi_is_enabled = False
else:
try:
catalog = keystone_client.get_service_catalog(
Expand Down
298 changes: 0 additions & 298 deletions ceilometer/dispatcher/data/gnocchi_resources.yaml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ceilometer/dispatcher/gnocchi_opts.py
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions ceilometer/gnocchi_client.py
View file
Open in desktop
Expand Up @@ -21,12 +21,10 @@
LOG = log.getLogger(__name__)


def get_gnocchiclient(conf, timeout_override=False):
group = conf.dispatcher_gnocchi.auth_section
timeout = (None if (not conf.dispatcher_gnocchi.request_timeout or
timeout_override)
else conf.dispatcher_gnocchi.request_timeout)
session = keystone_client.get_session(conf, group=group, timeout=timeout)
def get_gnocchiclient(conf, request_timeout=None):
group = conf.gnocchi.auth_section
session = keystone_client.get_session(conf, group=group,
timeout=request_timeout)
adapter = keystoneauth1.session.TCPKeepAliveAdapter(
pool_maxsize=conf.max_parallel_requests)
session.mount("http://", adapter)
Expand Down Expand Up @@ -188,7 +186,7 @@ def get_gnocchiclient(conf, timeout_override=False):


def upgrade_resource_types(conf):
gnocchi = get_gnocchiclient(conf, True)
gnocchi = get_gnocchiclient(conf)
for name, attributes in resources_initial.items():
try:
gnocchi.resource_type.get(name=name)
Expand Down
2 changes: 1 addition & 1 deletion ceilometer/keystone_client.py
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@

# List of group that can set auth_section to use a different
# credentials section
OVERRIDABLE_GROUPS = ['dispatcher_gnocchi', 'zaqar']
OVERRIDABLE_GROUPS = ['gnocchi', 'zaqar']


def get_session(conf, requests_session=None, group=None, timeout=None):
Expand Down