Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.toolbox
Commits
a8601559
Commit
a8601559
authored
Jan 30, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: merge status2rss with monitor state generation script in order to have consistent results
parent
8ba67db8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
113 additions
and
130 deletions
+113
-130
slapos/monitor/collect.py
slapos/monitor/collect.py
+3
-3
slapos/monitor/globalstate.py
slapos/monitor/globalstate.py
+109
-46
slapos/monitor/runpromise.py
slapos/monitor/runpromise.py
+1
-1
slapos/monitor/status2rss.py
slapos/monitor/status2rss.py
+0
-80
No files found.
slapos/monitor/collect.py
View file @
a8601559
...
...
@@ -321,13 +321,13 @@ def main():
'memory_percent'
,
'memory_rss'
,
'io_rw_counter'
,
'io_cycles_counter'
,
'disk_used'
]
resource_status_dict
=
{}
if
not
os
.
path
.
exists
(
process_file
):
if
not
os
.
path
.
exists
(
process_file
)
or
os
.
stat
(
process_file
).
st_size
==
0
:
initProcessDataFile
(
process_file
)
if
not
os
.
path
.
exists
(
mem_file
):
if
not
os
.
path
.
exists
(
mem_file
)
or
os
.
stat
(
mem_file
).
st_size
==
0
:
initMemoryDataFile
(
mem_file
)
if
not
os
.
path
.
exists
(
io_file
):
if
not
os
.
path
.
exists
(
io_file
)
or
os
.
stat
(
io_file
).
st_size
==
0
:
initIODataFile
(
io_file
)
if
process_result
and
process_result
[
'total_process'
]
!=
0.0
:
...
...
slapos/monitor/globalstate.py
View file @
a8601559
...
...
@@ -7,6 +7,54 @@ import json
import
ConfigParser
import
time
from
datetime
import
datetime
import
base64
import
hashlib
import
PyRSS2Gen
def
getKey
(
item
):
return
item
.
pubDate
class
monitorFeed
(
object
):
def
__init__
(
self
,
instance_name
,
hosting_name
,
public_url
,
private_url
,
feed_url
):
self
.
rss_item_list
=
[]
self
.
report_date
=
datetime
.
utcnow
()
self
.
instance_name
=
instance_name
self
.
hosting_name
=
hosting_name
self
.
public_url
=
public_url
self
.
private_url
=
private_url
self
.
feed_url
=
feed_url
def
appendItem
(
self
,
item_dict
):
event_time
=
datetime
.
fromtimestamp
(
item_dict
[
'change-time'
])
description
=
item_dict
.
get
(
'message'
,
''
)
rss_item
=
PyRSS2Gen
.
RSSItem
(
categories
=
[
item_dict
[
'status'
]],
source
=
PyRSS2Gen
.
Source
(
item_dict
[
'title'
],
self
.
public_url
),
title
=
'[%s] %s'
%
(
item_dict
[
'status'
],
item_dict
[
'title'
]),
comments
=
description
,
description
=
"%s: %s
\
n
%s"
%
(
event_time
,
item_dict
[
'status'
],
description
),
link
=
self
.
private_url
,
pubDate
=
event_time
,
guid
=
PyRSS2Gen
.
Guid
(
base64
.
b64encode
(
"%s, %s"
%
(
self
.
hosting_name
,
item_dict
[
'title'
])))
)
self
.
rss_item_list
.
append
(
rss_item
)
def
genrss
(
self
,
output_file
):
### Build the rss feed
sorted
(
self
.
rss_item_list
,
key
=
getKey
)
rss_feed
=
PyRSS2Gen
.
RSS2
(
title
=
self
.
instance_name
,
link
=
self
.
feed_url
,
description
=
self
.
hosting_name
,
lastBuildDate
=
self
.
report_date
,
items
=
self
.
rss_item_list
)
with
open
(
output_file
,
'w'
)
as
frss
:
frss
.
write
(
rss_feed
.
to_xml
())
def
softConfigGet
(
config
,
*
args
,
**
kwargs
):
try
:
...
...
@@ -15,8 +63,8 @@ def softConfigGet(config, *args, **kwargs):
return
""
def
generateStatisticsData
(
stat_file_path
,
content
):
# csv document for statictics
if
not
os
.
path
.
exists
(
stat_file_path
):
# csv document for s
uccess/error s
tatictics
if
not
os
.
path
.
exists
(
stat_file_path
)
or
os
.
stat
(
stat_file_path
).
st_size
==
0
:
with
open
(
stat_file_path
,
'w'
)
as
fstat
:
data_dict
=
{
"date"
:
time
.
time
(),
...
...
@@ -52,8 +100,16 @@ def run(args_list):
related_monitor_list
=
monitor_config
.
get
(
"monitor"
,
"monitor-url-list"
).
split
()
statistic_folder
=
os
.
path
.
join
(
base_folder
,
'data'
,
'.jio_documents'
)
parameter_file
=
os
.
path
.
join
(
base_folder
,
'config'
,
'.jio_documents'
,
'config.json'
)
feed_output
=
os
.
path
.
join
(
status_folder
,
'feed'
)
public_url
=
"%s/share/jio_public/"
%
base_url
private_url
=
"%s/share/jio_private/"
%
base_url
feed_url
=
"%s/public/feed"
%
base_url
report_date
=
datetime
.
now
().
strftime
(
'%Y-%m-%d %H:%M:%S'
)
error
=
warning
=
success
=
0
status
=
'OK'
promise_list
=
[]
global_state_file
=
os
.
path
.
join
(
base_folder
,
'monitor.global.json'
)
public_state_file
=
os
.
path
.
join
(
status_folder
,
'monitor.global.json'
)
if
not
os
.
path
.
exists
(
statistic_folder
):
try
:
...
...
@@ -67,11 +123,19 @@ def run(args_list):
file_list
=
filter
(
os
.
path
.
isfile
,
glob
.
glob
(
"%s/*.status.json"
%
status_folder
)
)
error
=
warning
=
success
=
0
status
=
'OK'
promise_list
=
[]
global_state_file
=
os
.
path
.
join
(
base_folder
,
'monitor.global.json'
)
public_state_file
=
os
.
path
.
join
(
status_folder
,
'monitor.global.json'
)
if
os
.
path
.
exists
(
instance_file
):
config
=
ConfigParser
.
ConfigParser
()
config
.
read
(
instance_file
)
else
:
raise
Exception
(
"Cannot read instance configuration at %s"
%
instance_file
)
report_date
=
datetime
.
now
().
strftime
(
'%Y-%m-%d %H:%M:%S'
)
monitor_feed
=
monitorFeed
(
config
.
get
(
'instance'
,
'name'
),
config
.
get
(
'instance'
,
'root-name'
),
public_url
,
private_url
,
feed_url
)
for
file
in
file_list
:
try
:
with
open
(
file
,
'r'
)
as
temp_file
:
...
...
@@ -87,13 +151,16 @@ def run(args_list):
warning
+=
1
tmp_json
[
'time'
]
=
tmp_json
[
'start-date'
].
split
(
' '
)[
1
]
promise_list
.
append
(
tmp_json
)
monitor_feed
.
appendItem
(
tmp_json
)
if
error
:
status
=
'ERROR'
elif
warning
:
status
=
'WARNING'
monitor_feed
.
genrss
(
feed_output
)
global_state_dict
=
dict
(
status
=
status
,
state
=
{
'error'
:
error
,
...
...
@@ -103,23 +170,19 @@ def run(args_list):
type
=
'global'
,
date
=
report_date
,
_links
=
{
"rss_url"
:
{
"href"
:
"%s/public/feed"
%
base_url
},
"public_url"
:
{
"href"
:
"%s/share/jio_public/"
%
base
_url
},
"private_url"
:
{
"href"
:
"%s/share/jio_private/"
%
bas
e_url
}
"public_url"
:
{
"href"
:
public
_url
},
"private_url"
:
{
"href"
:
privat
e_url
}
},
data
=
{
'state'
:
'monitor_state.data'
,
'process_state'
:
'monitor_process_resource.status'
,
'process_resource'
:
'monitor_resource_process.data'
,
'memory_resource'
:
'monitor_resource_memory.data'
,
'io_resource'
:
'monitor_resource_io.data'
,
'monitor_process_state'
:
'monitor_resource.status'
}
)
'monitor_process_state'
:
'monitor_resource.status'
},
_embedded
=
{
'promises'
:
promise_list
},
global_state_dict
[
'_embedded'
]
=
{
'promises'
:
promise_list
}
)
if
os
.
path
.
exists
(
instance_file
):
config
=
ConfigParser
.
ConfigParser
()
config
.
read
(
instance_file
)
if
'instance'
in
config
.
sections
():
instance_dict
=
{}
global_state_dict
[
'title'
]
=
config
.
get
(
'instance'
,
'name'
)
global_state_dict
[
'hosting-title'
]
=
config
.
get
(
'instance'
,
'root-name'
)
...
...
slapos/monitor/runpromise.py
View file @
a8601559
...
...
@@ -59,7 +59,7 @@ class RunPromise(object):
if
self
.
config
.
timeout_file
and
\
os
.
path
.
exists
(
self
.
config
.
timeout_file
):
with
open
(
self
.
config
.
timeout_file
)
as
tf
:
timeout
=
tf
.
read
()
timeout
=
tf
.
read
()
.
strip
()
if
timeout
.
isdigit
():
self
.
promise_timeout
=
int
(
timeout
)
else
:
...
...
slapos/monitor/status2rss.py
deleted
100644 → 0
View file @
8ba67db8
import
sys
import
os
import
json
from
datetime
import
datetime
import
base64
import
hashlib
import
PyRSS2Gen
import
argparse
def
parseArguments
():
"""
Parse arguments for monitor Rss Generator.
"""
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
'--items_folder'
,
help
=
'Path where to get *.status.json files which contain result of promises.'
)
parser
.
add_argument
(
'--output'
,
help
=
'The Path of file where feed file will be saved.'
)
parser
.
add_argument
(
'--feed_url'
,
help
=
'Url of this feed file.'
)
parser
.
add_argument
(
'--public_url'
,
help
=
'Monitor Instance public URL.'
)
parser
.
add_argument
(
'--private_url'
,
help
=
'Monitor Instance private URL.'
)
parser
.
add_argument
(
'--instance_name'
,
default
=
'UNKNOW Software Instance'
,
help
=
'Software Instance name.'
)
parser
.
add_argument
(
'--hosting_name'
,
default
=
''
,
help
=
'Hosting Subscription name.'
)
return
parser
.
parse_args
()
def
getKey
(
item
):
return
item
.
pubDate
def
genrss
():
parser
=
parseArguments
()
rss_item_list
=
[]
report_date
=
datetime
.
utcnow
()
for
filename
in
os
.
listdir
(
parser
.
items_folder
):
if
filename
.
endswith
(
".status.json"
):
filepath
=
os
.
path
.
join
(
parser
.
items_folder
,
filename
)
result_dict
=
None
try
:
result_dict
=
json
.
load
(
open
(
filepath
,
"r"
))
except
ValueError
:
print
"Failed to load json file: %s"
%
filepath
continue
description
=
result_dict
.
get
(
'message'
,
''
)
event_time
=
datetime
.
fromtimestamp
(
result_dict
[
'change-time'
])
rss_item
=
PyRSS2Gen
.
RSSItem
(
categories
=
[
result_dict
[
'status'
]],
source
=
PyRSS2Gen
.
Source
(
result_dict
[
'title'
],
parser
.
public_url
),
title
=
'[%s] %s'
%
(
result_dict
[
'status'
],
result_dict
[
'title'
]),
comments
=
description
,
description
=
"%s: %s
\
n
%s"
%
(
event_time
,
result_dict
[
'status'
],
description
),
link
=
parser
.
private_url
,
pubDate
=
event_time
,
guid
=
PyRSS2Gen
.
Guid
(
base64
.
b64encode
(
"%s, %s"
%
(
parser
.
hosting_name
,
result_dict
[
'title'
])))
)
rss_item_list
.
append
(
rss_item
)
### Build the rss feed
sorted
(
rss_item_list
,
key
=
getKey
)
rss_feed
=
PyRSS2Gen
.
RSS2
(
title
=
parser
.
instance_name
,
link
=
parser
.
feed_url
,
description
=
parser
.
hosting_name
,
lastBuildDate
=
report_date
,
items
=
rss_item_list
)
with
open
(
parser
.
output
,
'w'
)
as
frss
:
frss
.
write
(
rss_feed
.
to_xml
())
def
main
():
exit
(
genrss
())
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