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

Undo changes in ceilometer yamls #2

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Undo changes in ceilometer yamls #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
23e6646
Undo changes in ceilometer yamls
Aug 17, 2018
0551ba6
Replace the Gnocchi dispatcher by a publisher
jd Sep 4, 2017
081d7b7
Replace jsonutils by ujson
jd Oct 18, 2017
60e92cc
simplify cache generation
chungg Nov 23, 2017
a332300
Replace ujson with json
javacruft Jan 3, 2018
69d4c25
use hashmap to quickly find matching resource def
chungg Nov 23, 2017
d1d864d
compute sample as dictionary once
chungg Nov 24, 2017
0a30ff4
fix gnocchi stats logging
chungg Nov 24, 2017
03de7cc
simplify gnocchi batch push setup
chungg Nov 25, 2017
e8494e7
Cached should not be used when creating gnocchi resources
xuqiankun Nov 30, 2017
e82a6ed
set cache with attributes only
chungg Jan 30, 2018
a5ab472
gnocchi: configure archive policies on Ceilo side
Jan 3, 2018
863e77c
Don't use gnocchiclient during publisher init
Mar 1, 2018
156099b
fix gnocchi publisher
chungg Oct 17, 2017
f385767
gnocchi: don't create metrics with resource
sileht Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ceilometer/api/controllers/v2/root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Loading