summaryrefslogtreecommitdiff
path: root/ironic_python_agent/api/controllers
diff options
context:
space:
mode:
authorJosh Gachnang <josh@pcsforeducation.com>2014-09-08 20:26:51 -0700
committerJay Faulkner <jay@jvf.cc>2016-08-03 11:24:54 -0700
commitfd874652e3558cc2f9a3512f0c7b4e2f4170ec22 (patch)
treeb3612e57e460469972460393aa05a1f5df00d00b /ironic_python_agent/api/controllers
parentad60806f93c7d4cc9eec61ff24486db091ecb215 (diff)
downloadironic-python-agent-fd874652e3558cc2f9a3512f0c7b4e2f4170ec22.tar.gz
Add metrics support to IPA
This utilizes the new metrics support in ironic-lib to allow the agent to report timing metrics for agent API methods as configured in ironic-lib. Additionally, this adds developer docs on how to use metrics in IPA, including some caveats specific to ironic-lib.metrics use in IPA. Co-Authored-By: Jay Faulkner <jay@jvf.cc> Co-Authored-By: Alex Weeks <alex.weeks@gmail.com> Change-Id: Ic08d4ff78b6fb614b474b956a32eac352a14262a Partial-bug: #1526219
Diffstat (limited to 'ironic_python_agent/api/controllers')
-rw-r--r--ironic_python_agent/api/controllers/root.py5
-rw-r--r--ironic_python_agent/api/controllers/v1/command.py42
-rw-r--r--ironic_python_agent/api/controllers/v1/status.py8
3 files changed, 31 insertions, 24 deletions
diff --git a/ironic_python_agent/api/controllers/root.py b/ironic_python_agent/api/controllers/root.py
index 46caaad0..c95e2186 100644
--- a/ironic_python_agent/api/controllers/root.py
+++ b/ironic_python_agent/api/controllers/root.py
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from ironic_lib import metrics_utils
import pecan
from pecan import rest
-
from wsme import types as wtypes
import wsmeext.pecan as wsme_pecan
@@ -81,7 +81,8 @@ class RootController(rest.RestController):
# NOTE: The reason why convert() it's being called for every
# request is because we need to get the host url from
# the request object to make the links.
- return Root.convert()
+ with metrics_utils.get_metrics_logger(__name__).timer('get'):
+ return Root.convert()
@pecan.expose()
def _route(self, args):
diff --git a/ironic_python_agent/api/controllers/v1/command.py b/ironic_python_agent/api/controllers/v1/command.py
index e4483e29..b6971fa7 100644
--- a/ironic_python_agent/api/controllers/v1/command.py
+++ b/ironic_python_agent/api/controllers/v1/command.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+from ironic_lib import metrics_utils
import pecan
from pecan import rest
from wsme import types
@@ -78,9 +79,10 @@ class CommandController(rest.RestController):
@wsme_pecan.wsexpose(CommandResultList)
def get_all(self):
"""Get all command results."""
- agent = pecan.request.agent
- results = agent.list_command_results()
- return CommandResultList.from_results(results)
+ with metrics_utils.get_metrics_logger(__name__).timer('get_all'):
+ agent = pecan.request.agent
+ results = agent.list_command_results()
+ return CommandResultList.from_results(results)
@wsme_pecan.wsexpose(CommandResult, types.text, types.text)
def get_one(self, result_id, wait=None):
@@ -91,13 +93,14 @@ class CommandController(rest.RestController):
:returns: a :class:`ironic_python_agent.api.controller.v1.command.
CommandResult` object.
"""
- agent = pecan.request.agent
- result = agent.get_command_result(result_id)
+ with metrics_utils.get_metrics_logger(__name__).timer('get_one'):
+ agent = pecan.request.agent
+ result = agent.get_command_result(result_id)
- if wait and wait.lower() == 'true':
- result.join()
+ if wait and wait.lower() == 'true':
+ result.join()
- return CommandResult.from_result(result)
+ return CommandResult.from_result(result)
@wsme_pecan.wsexpose(CommandResult, types.text, body=Command)
def post(self, wait=None, command=None):
@@ -109,14 +112,15 @@ class CommandController(rest.RestController):
:returns: a :class:`ironic_python_agent.api.controller.v1.command.
CommandResult` object.
"""
- # the POST body is always the last arg,
- # so command must be a kwarg here
- if command is None:
- command = Command()
- agent = pecan.request.agent
- result = agent.execute_command(command.name, **command.params)
-
- if wait and wait.lower() == 'true':
- result.join()
-
- return result
+ with metrics_utils.get_metrics_logger(__name__).timer('post'):
+ # the POST body is always the last arg,
+ # so command must be a kwarg here
+ if command is None:
+ command = Command()
+ agent = pecan.request.agent
+ result = agent.execute_command(command.name, **command.params)
+
+ if wait and wait.lower() == 'true':
+ result.join()
+
+ return result
diff --git a/ironic_python_agent/api/controllers/v1/status.py b/ironic_python_agent/api/controllers/v1/status.py
index 84efc6a4..b1ed83b8 100644
--- a/ironic_python_agent/api/controllers/v1/status.py
+++ b/ironic_python_agent/api/controllers/v1/status.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+from ironic_lib import metrics_utils
import pecan
from pecan import rest
from wsme import types
@@ -48,6 +49,7 @@ class StatusController(rest.RestController):
@wsme_pecan.wsexpose(AgentStatus)
def get_all(self):
"""Get current status of the running agent."""
- agent = pecan.request.agent
- status = agent.get_status()
- return AgentStatus.from_agent_status(status)
+ with metrics_utils.get_metrics_logger(__name__).timer('get_all'):
+ agent = pecan.request.agent
+ status = agent.get_status()
+ return AgentStatus.from_agent_status(status)