External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 21:46:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Enable ActivityStream capture for Instances

Browse Source
This commit is contained in:
Jeff Bradberry
2021-10-19 14:37:48 -04:00
parent 89befa7ac1
commit f691bb2c1d
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@@ -5003,6 +5003,7 @@ class ActivityStreamSerializer(BaseSerializer):
('credential_type', ('id', 'name', 'description', 'kind', 'managed')), ('credential_type', ('id', 'name', 'description', 'kind', 'managed')),
('ad_hoc_command', ('id', 'name', 'status', 'limit')), ('ad_hoc_command', ('id', 'name', 'status', 'limit')),
('workflow_approval', ('id', 'name', 'unified_job_id')), ('workflow_approval', ('id', 'name', 'unified_job_id')),
('instance', ('id', 'hostname')),
] ]
return field_list return field_list

1
awx/main/models/__init__.py
View File

@@ -201,6 +201,7 @@ activity_stream_registrar.connect(Organization)
activity_stream_registrar.connect(Inventory) activity_stream_registrar.connect(Inventory)
activity_stream_registrar.connect(Host) activity_stream_registrar.connect(Host)
activity_stream_registrar.connect(Group) activity_stream_registrar.connect(Group)
activity_stream_registrar.connect(Instance)
activity_stream_registrar.connect(InventorySource) activity_stream_registrar.connect(InventorySource)
# activity_stream_registrar.connect(InventoryUpdate) # activity_stream_registrar.connect(InventoryUpdate)
activity_stream_registrar.connect(Credential) activity_stream_registrar.connect(Credential)

1
awx/main/signals.py
View File

@@ -377,6 +377,7 @@ def model_serializer_mapping():
models.Inventory: serializers.InventorySerializer, models.Inventory: serializers.InventorySerializer,
models.Host: serializers.HostSerializer, models.Host: serializers.HostSerializer,
models.Group: serializers.GroupSerializer, models.Group: serializers.GroupSerializer,
models.Instance: serializers.InstanceSerializer,
models.InstanceGroup: serializers.InstanceGroupSerializer, models.InstanceGroup: serializers.InstanceGroupSerializer,
models.InventorySource: serializers.InventorySourceSerializer, models.InventorySource: serializers.InventorySourceSerializer,
models.Credential: serializers.CredentialSerializer, models.Credential: serializers.CredentialSerializer,

3
awx/main/tasks.py
View File

@@ -288,6 +288,9 @@ def apply_cluster_membership_policies():
continue continue
instances_to_add = set(g.instances) - set(g.prior_instances) instances_to_add = set(g.instances) - set(g.prior_instances)
instances_to_remove = set(g.prior_instances) - set(g.instances) instances_to_remove = set(g.prior_instances) - set(g.instances)
# The following writes to the db don't spam the activity stream, because
# InstanceGroup is special-cased in signals.py to connect to only the non-m2m
# signal handlers.
if instances_to_add: if instances_to_add:
logger.debug('Adding instances {} to group {}'.format(list(instances_to_add), g.obj.name)) logger.debug('Adding instances {} to group {}'.format(list(instances_to_add), g.obj.name))
g.obj.instances.add(*instances_to_add) g.obj.instances.add(*instances_to_add)