Skip to content

HostManager -- new docker stuff #88

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
mhasself merged 3 commits into from
Apr 3, 2026
Merged

HostManager -- new docker stuff #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f03a4c0
HostManager: new docker functionality
mhasself Mar 30, 2026
867e120
Make sure that last works with old HM too.
mhasself Mar 30, 2026
c62e62e
Update HostManager fake agent.
mhasself Mar 30, 2026
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
23 changes: 16 additions & 7 deletions agent/hostmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,64 @@ processes:
'timestamp_field': 'timestamp'
}
data: {
"orphans": {},
"new_tags": {},
"child_states": [
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "ocs-aggregator"
"instance_id": "ocs-aggregator",
"restart_required": false
},
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "ocs-influx-publisher"
"instance_id": "ocs-influx-publisher",
"restart_required": true
},
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "ocs-registry"
"instance_id": "ocs-registry",
"restart_required": false
},
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "hk-agent-01"
"instance_id": "hk-agent-01",
"restart_required": false
},
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "ocs-ups-satp-c2-01"
"instance_id": "ocs-ups-satp-c2-01",
"restart_required": false
},
{
"next_action": "up",
"target_state": "up",
"stability": 1,
"agent_class": "[docker]",
"instance_id": "ocs-ups-satp-c1-01"
"instance_id": "ocs-ups-satp-c1-01",
"restart_required": false
},
{
"next_action": "down",
"target_state": "down",
"stability": 0.9978726211941876,
"agent_class": "[docker]",
"instance_id": "ocs-latr-pfeiffer-01"
"instance_id": "ocs-latr-pfeiffer-01",
"restart_required": false
}
]
}
Expand Down
102 changes: 91 additions & 11 deletions src/panels/HostManager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,35 @@
<div class="block_unit">
<div class="box">
<OcsAgentHeader>Host Manager</OcsAgentHeader>
<h2>Connection</h2>
<h2>Status</h2>
<OpReading caption="Address"
v-bind:value="address">
</OpReading>
<OpReading caption="Connection"
mode="ok"
v-bind:value="panel.connection_ok">
</OpReading>
<OcsLightLine caption="OCS/Agent">
<OcsLight
caption="Connection"
tip="Status of the connection between ocs-web and OCS crossbar."
:value="panel.connection_ok"
/>
<OcsLight
caption="Restarts"
tip="Indicates whether running agents have an update pending; if red, consider restarting agents (as marked in list)."
:value="this.restartCount <= 0"
v-if="this.sessionSchema > 0"
/>
<OcsLight
caption="Images"
tip="Indicates whether all image tags are present on system; if red, consider run of docker_pull task."
:value="this.pullCount <= 0"
v-if="this.sessionSchema > 0"
/>
<OcsLight
caption="Orphans"
tip="Indicates whether orphan containers are found on system; if red, consider run of remove_orphans task."
:value="this.orphanCount <= 0"
v-if="this.sessionSchema > 0"
/>
</OcsLightLine>
<form v-on:submit.prevent>
<div class="ocs_row">
<label>Refresh config</label>
Expand All @@ -33,8 +54,9 @@
<span class="hm_center">target</span>
<span class="ocs_double hm_center">set-target</span>
</div>
<div v-for="item in children" :key="item.instance_id" class="hm_row">
<span>{{ item.instance_id }}</span>
<div v-for="item in children" :key="item.instance_id" class="hm_row"
:class="{hm_row_emph: item.restart_required}">
<span>{{ item.instance_id }}{{ item.restart_indicator }}</span>
<span>{{ item.agent_class }}</span>
<span class="hm_center">{{ item.next_action }}</span>
<span class="hm_center">{{ item.target_state }}</span>
Expand Down Expand Up @@ -62,7 +84,28 @@

<OcsTask
:op_data="ops.die">
<div class="ocs_row">
<label>Disown dockers?</label>
<input type="checkbox" id="checkbox" v-model="ops.die.params.disown_dockers"
class="ocs_double" />
</div>
</OcsTask>

<OcsTask
:op_data="ops.docker_pull"
v-if="this.sessionSchema > 0"
/>

<OcsTask
:op_data="ops.remove_orphans"
v-if="this.sessionSchema > 0"
/>

<!-- etc -->
<OcsOpAutofill
:ops_parent="ops"
/>

</div>
</div>
</template>
Expand All @@ -75,23 +118,39 @@
return {
panel: {},
children: [],
sessionSchema: 0,
restartCount: null,
pullCount: null,
orphanCount: null,
ops: window.ocs_bundle.web.ops_data_init({
'manager': {},
'update': {
params: {reload_config: false},
},
'die': {},
'docker_pull': {},
'remove_orphans': {},
}),
}
},
props: {
address: String,
},
methods: {
update_child_states(op_name, method, stat, msg, session) {
update_from_session_data(op_name, method, stat, msg, session) {
if (!session.data || session.status != 'running')
return;

if (Object.hasOwn(session.data, 'orphans'))
this.sessionSchema = 1;
else
this.sessionSchema = 0;

if (this.sessionSchema > 0) {
this.orphanCount = Object.keys(session.data.orphans).length;
this.pullCount = Object.keys(session.data.new_tags).length;
}

function sortKey(state) {
return [state.agent_class.toUpperCase(),
state.agent_class,
Expand All @@ -103,6 +162,17 @@
.map(state => [sortKey(state), state])
.toSorted()
.map(([,state]) => state);
let rc = 0;
for (const child of this.children) {
if (child?.restart_required) {
child.restart_indicator = ' *update-pending*';
rc += 1;
} else {
child.restart_indicator = '';
}
}

this.restartCount = rc;
},
set_target(child, updn) {
child.target_state = '(' + updn + ')';
Expand All @@ -111,11 +181,17 @@
});
},
refresh_config() {
window.ocs_bundle.ui_start_proc(this.address, 'update',
{'reload_config': true});
window.ocs_bundle.ui_start_proc(this.address, 'update',
{'reload_config': true});
},
remove_orphans() {
window.ocs_bundle.ui_start_proc(this.address, 'remove_orphans', {});
},
docker_pull() {
window.ocs_bundle.ui_start_proc(this.address, 'docker_pull', {});
},
startListening() {
this.panel.client.add_watcher('manager', 5., this.update_child_states);
this.panel.client.add_watcher('manager', 5., this.update_from_session_data);
},
},
}
Expand All @@ -142,6 +218,10 @@
padding: 10px 0px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.hm_row_emph {
font-style: italic;
}
.hm_header {
border-bottom: 1px solid black;
Expand Down
Loading