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.

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

cockpit: Implement PCP metrics channel in the Python bridge #20049

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions pkg/pcp/manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"requires": {
"cockpit": "239"
},
"bridges": [
{
"match": { "payload": "metrics1" },
"spawn": [ "${libexecdir}/cockpit-pcp" ]
}
]
}
}
7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ module = [
"libvirt_qemu",
"pika",

# run without pcp module types
"pcp",
"cpmapi",

# run without gobject-introspection (used from cockpit-client for Gtk)
"gi.*",

Expand Down Expand Up @@ -158,6 +162,7 @@ ignore_names = [
"do_*",
"pytest_*",
"test[A-Z0-9]*",
"pytestmark",
]
ignore_decorators = [
"@*.getter",
Expand Down Expand Up @@ -200,6 +205,8 @@ wheel_build_env = pkg
# All other environments (names like py311-lint, py36-pytest, etc) are isolated
# from the system and get their packages from PyPI, according to the specific
# test environment being requested. We build the wheel in a common environment.
# These tests will not run the PCP tests as there is no wheel available.
# https://github.com/performancecopilot/pcp/issues/2076
[testenv]
package = wheel
wheel_build_env = venv-pkg
Expand Down
3 changes: 0 additions & 3 deletions src/bridge/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,6 @@ endif

if ENABLE_PCP

pmlogconfdir = $(localstatedir)/lib/pcp/config/pmlogconf/tools
dist_pmlogconf_DATA = src/bridge/pmlogconf/cockpit

libexec_PROGRAMS += cockpit-pcp

noinst_LIBRARIES += libcockpit-pcp.a
Expand Down
9 changes: 0 additions & 9 deletions src/bridge/pmlogconf/cockpit

This file was deleted.

2 changes: 2 additions & 0 deletions src/cockpit/channels/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from .http import HttpChannel
from .metrics import InternalMetricsChannel
from .packages import PackagesChannel
from .pcp import PcpMetricsChannel
from .stream import SocketStreamChannel, SubprocessStreamChannel
from .trivial import EchoChannel, NullChannel

Expand All @@ -35,6 +36,7 @@
InternalMetricsChannel,
NullChannel,
PackagesChannel,
PcpMetricsChannel,
jelly marked this conversation as resolved.
Show resolved Hide resolved
SubprocessStreamChannel,
SocketStreamChannel,
]
Loading