Skip to content

Commit 3789e42

Browse files
committed
add persistence
1 parent 407f1e7 commit 3789e42

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

Diff for: kubejobs/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ def monitoring_application(self):
164164

165165
def validate(self, data):
166166
data_model = {
167-
"datasource_type": six.string_types,
168167
"enable_visualizer": bool,
169168
"expected_time": int,
170169
"number_of_jobs": int,

Diff for: monitor/cli/main.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
from flask import Flask
1717
from monitor.api.v10 import rest
1818
from monitor.service import api
19-
19+
from monitor.utils.logger import configure_logging
2020

2121
def main():
2222
app = Flask(__name__)
23+
configure_logging()
2324
app.register_blueprint(rest)
2425
app.run(host='0.0.0.0', port=api.port, debug=True)

Diff for: monitor/service/api/v10.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,18 @@ def start_monitoring(data, app_id):
3434
API_LOG.log("Missing parameters in request")
3535
raise ex.BadRequestException()
3636

37-
plugin = data['plugin']
37+
plugin = data['plugin']['name']
3838
plugin_info = data['plugin_info']
3939

4040
if app_id not in monitored_apps:
41-
executor = plugin_service.get_plugin(plugin)(app_id, plugin_info)
41+
try:
42+
executor = plugin_service.get_plugin(plugin)(app_id, plugin_info)
43+
except ImportError:
44+
plugin_data = data['plugin']
45+
plugin_service.install_plugin(plugin_data['source'],
46+
plugin_data['plugin_source'])
47+
executor = plugin_service.get_plugin(plugin)(app_id, plugin_info)
48+
4249
monitored_apps[app_id] = executor
4350
executor.start()
4451

0 commit comments

Comments
 (0)