CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename step

Browse Source
This commit is contained in:
Josh Patterson
2025-05-23 11:41:45 -04:00
parent 08f208cd38
commit be5e41227f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/_runners/setup_hypervisor.py
View File

@@ -664,7 +664,7 @@ def setup_environment(vm_name: str = 'sool9', disk_size: str = '220G', minion_id
# Run highstate on the hypervisor # Run highstate on the hypervisor
highstate_result = local.cmd(minion_id, 'state.highstate', [], timeout=1800) highstate_result = local.cmd(minion_id, 'state.highstate', [], timeout=1800)
if highstate_result and minion_id in highstate_result: if highstate_result and minion_id in highstate_result:
log.info("MAIN: Highstate triggered on %s", minion_id) log.info("MAIN: Highstate initiated on %s", minion_id)
else: else:
log.error("MAIN: Highstate failed or timed out on %s", minion_id) log.error("MAIN: Highstate failed or timed out on %s", minion_id)
return { return {

2
salt/soc/dyanno/hypervisor/map.jinja
View File

@@ -9,6 +9,6 @@
'Initialize Minion Pillars', 'Initialize Minion Pillars',
'Created Instance', 'Created Instance',
'Hardware Configuration', 'Hardware Configuration',
'Highstate Triggered', 'Highstate Initiated',
'Destroyed Instance' 'Destroyed Instance'
] %} ] %}

4
salt/soc/dyanno/hypervisor/soc_hypervisor.yaml.jinja
View File

@@ -27,7 +27,7 @@
{%- if baseDomainStatus == 'Initialized' %} {%- if baseDomainStatus == 'Initialized' %}
{%- if vm_list %} {%- if vm_list %}
#### Virtual Machines #### Virtual Machines
Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Triggered", only "Destroyed Instance" updates the timestamp. Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Initiated", only "Destroyed Instance" updates the timestamp.
| Name | Status | CPU Cores | Memory (GB)| Disk | Copper | SFP | Last Updated | | Name | Status | CPU Cores | Memory (GB)| Disk | Copper | SFP | Last Updated |
|--------------------|--------------------|-----------|------------|------|--------|------|---------------------| |--------------------|--------------------|-----------|------------|------|--------|------|---------------------|
@@ -42,7 +42,7 @@ Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %},
{%- endfor %} {%- endfor %}
{%- else %} {%- else %}
#### Virtual Machines #### Virtual Machines
Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Triggered", only "Destroyed Instance" updates the timestamp. Status values: {% for step in PROCESS_STEPS %}{{ step }}{% if not loop.last %}, {% endif %}{% endfor %}. "Last Updated" shows when status changed. After "Highstate Initiated", only "Destroyed Instance" updates the timestamp.
No Virtual Machines Found No Virtual Machines Found
{%- endif %} {%- endif %}

4
salt/vm/status/init.sls
View File

@@ -15,9 +15,9 @@
# so-salt-emit-vm-deployment-status sets event_tag = f'soc/dyanno/hypervisor/{status.lower()}' # so-salt-emit-vm-deployment-status sets event_tag = f'soc/dyanno/hypervisor/{status.lower()}'
vm_highstate_trigger: vm_highstate_trigger:
event.send: event.send:
- name: soc/dyanno/hypervisor/highstate triggered - name: soc/dyanno/hypervisor/highstate initiated
- data: - data:
status: Highstate Triggered status: Highstate Initiated
vm_name: {{ grains.id }} vm_name: {{ grains.id }}
hypervisor: {{ salt['grains.get']('salt-cloud:profile', '').split('-')[1] }} hypervisor: {{ salt['grains.get']('salt-cloud:profile', '').split('-')[1] }}
- order: 1 # Ensure this runs early in the highstate process - order: 1 # Ensure this runs early in the highstate process