Skip to content

CP-49916: Moved perfmon, perfmon.service and sysconfig-perfmon from scripts/ to python3/perfmon directory #5767

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

Merged
merged 1 commit into from
Jul 2, 2024
Merged

CP-49916: Moved perfmon, perfmon.service and sysconfig-perfmon from scripts/ to python3/perfmon directory #5767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions python3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ install:
$(IPROG) -d $(DESTDIR)$(SITE3_DIR)
$(IPROG) -d $(DESTDIR)$(LIBEXECDIR)
$(IPROG) -d $(DESTDIR)$(PLUGINDIR)
$(IPROG) -d $(DESTDIR)/etc/sysconfig
$(IPROG) -d $(DESTDIR)/usr/lib/systemd/system


$(IDATA) packages/inventory.py $(DESTDIR)$(SITE3_DIR)/
Expand All @@ -32,6 +34,11 @@ install:
$(IPROG) plugins/disk-space $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/install-supp-pack $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/echo.py $(DESTDIR)$(PLUGINDIR)/echo

$(IPROG) perfmon/perfmon $(DESTDIR)$(PLUGINDIR)
$(IDATA) perfmon/perfmon.service $(DESTDIR)/usr/lib/systemd/system/perfmon.service
$(IPROG) perfmon/sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon

# templates
$(IPROG) templates/debian $(DESTDIR)$(OPTDIR)/packages/post-install-scripts/debian-etch
$(IPROG) templates/debug $(DESTDIR)$(OPTDIR)/packages/post-install-scripts
Expand Down
2 changes: 1 addition & 1 deletion scripts/plugins/perfmon → python3/perfmon/perfmon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
# A plugin for requesting perfmon actions via the xe host-call-plugin mechanism

import XenAPIPlugin
import os
import socket
import XenAPIPlugin

# TODO: put this info plus all the supported cmds in a shared file
cmdsockname = "\0perfmon" # an af_unix socket name (the "\0" stops socket.bind() creating a fs node)
Expand Down
0 scripts/perfmon.service → python3/perfmon/perfmon.service
View file
Open in desktop
File renamed without changes.
0 scripts/sysconfig-perfmon → python3/perfmon/sysconfig-perfmon
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ install:
$(IDATA) cdrommon@.service $(DESTDIR)/usr/lib/systemd/system/cdrommon@.service
$(IDATA) gencert.service $(DESTDIR)/usr/lib/systemd/system/gencert.service
$(IDATA) xapi-domains.service $(DESTDIR)/usr/lib/systemd/system/xapi-domains.service
$(IDATA) perfmon.service $(DESTDIR)/usr/lib/systemd/system/perfmon.service
$(IDATA) generate-iscsi-iqn.service $(DESTDIR)/usr/lib/systemd/system/generate-iscsi-iqn.service
$(IDATA) xapi.service $(DESTDIR)/usr/lib/systemd/system/xapi.service
$(IDATA) attach-static-vdis.service $(DESTDIR)/usr/lib/systemd/system/attach-static-vdis.service
Expand Down Expand Up @@ -115,14 +114,11 @@ install:
$(IPROG) restore-sr-metadata.py $(DESTDIR)$(LIBEXECDIR)
$(IPROG) backup-metadata-cron $(DESTDIR)$(LIBEXECDIR)
$(IPROG) pbis-force-domain-leave $(DESTDIR)$(LIBEXECDIR)
mkdir -p $(DESTDIR)/etc/sysconfig
$(IPROG) sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
mkdir -p $(DESTDIR)$(EXTENSIONDIR)
$(IPROG) extensions/Test.test $(DESTDIR)$(EXTENSIONDIR)
$(IPROG) extensions/pool_update.precheck $(DESTDIR)$(EXTENSIONDIR)
$(IPROG) extensions/pool_update.apply $(DESTDIR)$(EXTENSIONDIR)
mkdir -p $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/perfmon $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/extauth-hook $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/extauth-hook-AD.py $(DESTDIR)$(PLUGINDIR)
$(IPROG) plugins/firewall-port $(DESTDIR)$(PLUGINDIR)
Expand Down
Loading