Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
511a77be
Commit
511a77be
authored
Aug 15, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Minor fixup for CRM/Abyss integration
See merge request
nexedi/slapos.core!566
parents
e72c1e3c
e06e1c23
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
master/bt5/slapos_abyss/SkinTemplateItem/portal_skins/slapos_abyss/DataArray_declareAsDefaultData.py
...rtal_skins/slapos_abyss/DataArray_declareAsDefaultData.py
+3
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
...tal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
+1
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
...slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
+7
-0
No files found.
master/bt5/slapos_abyss/SkinTemplateItem/portal_skins/slapos_abyss/DataArray_declareAsDefaultData.py
View file @
511a77be
...
@@ -21,4 +21,6 @@ for previous_array in portal.portal_catalog(
...
@@ -21,4 +21,6 @@ for previous_array in portal.portal_catalog(
if
batch
:
if
batch
:
return
return
context
.
Base_redirect
(
'view'
,
keep_items
=
{
'portal_status_message'
:
context
.
Base_translateString
(
"Declared as default data"
)})
return
context
.
Base_redirect
(
'view'
,
keep_items
=
{
'portal_status_message'
:
context
.
Base_translateString
(
"Declared as default data"
)})
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_checkState.py
View file @
511a77be
...
@@ -39,7 +39,7 @@ else:
...
@@ -39,7 +39,7 @@ else:
should_notify
=
True
should_notify
=
True
notification_message_reference
=
"slapos-crm-compute_node_check_modified_file.notification"
notification_message_reference
=
"slapos-crm-compute_node_check_modified_file.notification"
ticket_title
=
"[MONITORING] Compute Node %s has modified file"
%
reference
ticket_title
=
"[MONITORING] Compute Node %s has modified file"
%
reference
issue_document_reference
=
data_array
.
Reference
()
issue_document_reference
=
data_array
.
get
Reference
()
description
=
"The Compute Node %s (%s) has modified file: %s"
%
(
compute_node_title
,
reference
,
issue_document_reference
)
description
=
"The Compute Node %s (%s) has modified file: %s"
%
(
compute_node_title
,
reference
,
issue_document_reference
)
if
not
should_notify
:
if
not
should_notify
:
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
View file @
511a77be
...
@@ -23,6 +23,13 @@ if aggregate_portal_type == "Compute Node":
...
@@ -23,6 +23,13 @@ if aggregate_portal_type == "Compute Node":
last_contact
=
DateTime
(
d
.
get
(
'created_at'
))
last_contact
=
DateTime
(
d
.
get
(
'created_at'
))
if
(
now
-
last_contact
)
<
0.01
:
if
(
now
-
last_contact
)
<
0.01
:
ComputeNode_hasModifiedFile
=
getattr
(
document
,
"ComputeNode_hasModifiedFile"
,
None
)
if
ComputeNode_hasModifiedFile
:
data_array
=
ComputeNode_hasModifiedFile
()
if
data_array
:
return
"Compute Node %s (%s) has modified file: %s"
%
(
document
.
getTitle
(),
document
.
getReference
(),
data_array
.
getReference
())
# If server has no partitions skip
# If server has no partitions skip
compute_partition_uid_list
=
[
compute_partition_uid_list
=
[
x
.
getUid
()
for
x
in
document
.
contentValues
(
portal_type
=
"Compute Partition"
)
x
.
getUid
()
for
x
in
document
.
contentValues
(
portal_type
=
"Compute Partition"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment