From 5581577c83171ae4c016bd997da2e03b68704dad Mon Sep 17 00:00:00 2001 From: hsiang41 Date: Mon, 5 Nov 2018 14:04:55 +0800 Subject: [PATCH] Separate diskprediction local plugin from the diskprediction plugin Separate diskprediction local plugin from the diskprediction plugin. Devicehealth invoke device prediction function related on the global configuration "device_failure_prediction_mode". Signed-off-by: Rick Chen --- COPYING | 2 +- doc/mgr/diskprediction.rst | 6 +- src/common/options.cc | 1 + src/pybind/mgr/devicehealth/module.py | 31 ++ .../mgr/diskprediction_local/__init__.py | 1 + .../diskprediction_local/models/config.json | 77 +++++ .../mgr/diskprediction_local/models/svm_1.pkl | Bin 0 -> 281292 bytes .../diskprediction_local/models/svm_10.pkl | Bin 0 -> 217792 bytes .../diskprediction_local/models/svm_104.pkl | Bin 0 -> 492492 bytes .../diskprediction_local/models/svm_105.pkl | Bin 0 -> 217192 bytes .../diskprediction_local/models/svm_109.pkl | Bin 0 -> 256392 bytes .../diskprediction_local/models/svm_112.pkl | Bin 0 -> 499492 bytes .../diskprediction_local/models/svm_114.pkl | Bin 0 -> 276492 bytes .../diskprediction_local/models/svm_115.pkl | Bin 0 -> 509592 bytes .../diskprediction_local/models/svm_118.pkl | Bin 0 -> 315192 bytes .../diskprediction_local/models/svm_119.pkl | Bin 0 -> 485992 bytes .../diskprediction_local/models/svm_12.pkl | Bin 0 -> 275692 bytes .../diskprediction_local/models/svm_120.pkl | Bin 0 -> 307592 bytes .../diskprediction_local/models/svm_123.pkl | Bin 0 -> 246792 bytes .../diskprediction_local/models/svm_124.pkl | Bin 0 -> 310292 bytes .../diskprediction_local/models/svm_125.pkl | Bin 0 -> 452492 bytes .../diskprediction_local/models/svm_128.pkl | Bin 0 -> 550492 bytes .../diskprediction_local/models/svm_131.pkl | Bin 0 -> 493192 bytes .../diskprediction_local/models/svm_134.pkl | Bin 0 -> 266692 bytes .../diskprediction_local/models/svm_138.pkl | Bin 0 -> 488292 bytes .../diskprediction_local/models/svm_14.pkl | Bin 0 -> 244892 bytes .../diskprediction_local/models/svm_141.pkl | Bin 0 -> 422368 bytes .../diskprediction_local/models/svm_145.pkl | Bin 0 -> 359512 bytes .../diskprediction_local/models/svm_151.pkl | Bin 0 -> 305944 bytes .../diskprediction_local/models/svm_16.pkl | Bin 0 -> 308192 bytes .../diskprediction_local/models/svm_161.pkl | Bin 0 -> 305188 bytes .../diskprediction_local/models/svm_168.pkl | Bin 0 -> 301516 bytes .../diskprediction_local/models/svm_169.pkl | Bin 0 -> 363400 bytes .../diskprediction_local/models/svm_174.pkl | Bin 0 -> 323764 bytes .../diskprediction_local/models/svm_18.pkl | Bin 0 -> 312692 bytes .../diskprediction_local/models/svm_182.pkl | Bin 0 -> 354652 bytes .../diskprediction_local/models/svm_185.pkl | Bin 0 -> 317176 bytes .../diskprediction_local/models/svm_186.pkl | Bin 0 -> 276352 bytes .../diskprediction_local/models/svm_195.pkl | Bin 0 -> 489544 bytes .../diskprediction_local/models/svm_201.pkl | Bin 0 -> 307888 bytes .../diskprediction_local/models/svm_204.pkl | Bin 0 -> 567088 bytes .../diskprediction_local/models/svm_206.pkl | Bin 0 -> 474856 bytes .../diskprediction_local/models/svm_208.pkl | Bin 0 -> 283588 bytes .../diskprediction_local/models/svm_210.pkl | Bin 0 -> 617200 bytes .../diskprediction_local/models/svm_212.pkl | Bin 0 -> 345148 bytes .../diskprediction_local/models/svm_213.pkl | Bin 0 -> 357568 bytes .../diskprediction_local/models/svm_219.pkl | Bin 0 -> 342232 bytes .../diskprediction_local/models/svm_221.pkl | Bin 0 -> 365128 bytes .../diskprediction_local/models/svm_222.pkl | Bin 0 -> 314800 bytes .../diskprediction_local/models/svm_223.pkl | Bin 0 -> 342124 bytes .../diskprediction_local/models/svm_225.pkl | Bin 0 -> 329812 bytes .../diskprediction_local/models/svm_227.pkl | Bin 0 -> 296440 bytes .../diskprediction_local/models/svm_229.pkl | Bin 0 -> 572380 bytes .../diskprediction_local/models/svm_230.pkl | Bin 0 -> 251188 bytes .../diskprediction_local/models/svm_234.pkl | Bin 0 -> 277972 bytes .../diskprediction_local/models/svm_235.pkl | Bin 0 -> 243736 bytes .../diskprediction_local/models/svm_236.pkl | Bin 0 -> 377872 bytes .../diskprediction_local/models/svm_239.pkl | Bin 0 -> 571732 bytes .../diskprediction_local/models/svm_243.pkl | Bin 0 -> 534148 bytes .../diskprediction_local/models/svm_27.pkl | Bin 0 -> 504592 bytes .../mgr/diskprediction_local/models/svm_3.pkl | Bin 0 -> 557192 bytes .../diskprediction_local/models/svm_33.pkl | Bin 0 -> 547392 bytes .../diskprediction_local/models/svm_36.pkl | Bin 0 -> 516692 bytes .../diskprediction_local/models/svm_44.pkl | Bin 0 -> 546592 bytes .../diskprediction_local/models/svm_50.pkl | Bin 0 -> 448292 bytes .../diskprediction_local/models/svm_57.pkl | Bin 0 -> 328292 bytes .../diskprediction_local/models/svm_59.pkl | Bin 0 -> 494292 bytes .../mgr/diskprediction_local/models/svm_6.pkl | Bin 0 -> 314092 bytes .../diskprediction_local/models/svm_61.pkl | Bin 0 -> 499492 bytes .../diskprediction_local/models/svm_62.pkl | Bin 0 -> 483492 bytes .../diskprediction_local/models/svm_67.pkl | Bin 0 -> 492592 bytes .../diskprediction_local/models/svm_69.pkl | Bin 0 -> 288292 bytes .../diskprediction_local/models/svm_71.pkl | Bin 0 -> 228792 bytes .../diskprediction_local/models/svm_72.pkl | Bin 0 -> 489492 bytes .../diskprediction_local/models/svm_78.pkl | Bin 0 -> 491392 bytes .../diskprediction_local/models/svm_79.pkl | Bin 0 -> 284992 bytes .../diskprediction_local/models/svm_82.pkl | Bin 0 -> 255292 bytes .../diskprediction_local/models/svm_85.pkl | Bin 0 -> 522092 bytes .../diskprediction_local/models/svm_88.pkl | Bin 0 -> 502392 bytes .../diskprediction_local/models/svm_93.pkl | Bin 0 -> 302592 bytes .../diskprediction_local/models/svm_97.pkl | Bin 0 -> 272392 bytes src/pybind/mgr/diskprediction_local/module.py | 255 +++++++++++++++++ .../mgr/diskprediction_local/predictor.py | 265 ++++++++++++++++++ 83 files changed, 634 insertions(+), 4 deletions(-) create mode 100644 src/pybind/mgr/diskprediction_local/__init__.py create mode 100644 src/pybind/mgr/diskprediction_local/models/config.json create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_1.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_10.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_104.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_105.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_109.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_112.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_114.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_115.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_118.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_119.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_12.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_120.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_123.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_124.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_125.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_128.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_131.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_134.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_138.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_14.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_141.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_145.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_151.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_16.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_161.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_168.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_169.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_174.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_18.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_182.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_185.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_186.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_195.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_201.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_204.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_206.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_208.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_210.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_212.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_213.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_219.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_221.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_222.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_223.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_225.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_227.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_229.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_230.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_234.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_235.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_236.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_239.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_243.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_27.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_3.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_33.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_36.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_44.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_50.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_57.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_59.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_6.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_61.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_62.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_67.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_69.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_71.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_72.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_78.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_79.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_82.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_85.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_88.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_93.pkl create mode 100644 src/pybind/mgr/diskprediction_local/models/svm_97.pkl create mode 100644 src/pybind/mgr/diskprediction_local/module.py create mode 100644 src/pybind/mgr/diskprediction_local/predictor.py diff --git a/COPYING b/COPYING index 22acddf0e0d..8d663702b63 100644 --- a/COPYING +++ b/COPYING @@ -146,7 +146,7 @@ Files: src/include/timegm.h Copyright (C) Copyright 2010-2011 Vicente J. Botet Escriba License: Boost Software License, Version 1.0 -Files: src/pybind/mgr/diskprediction/predictor/models/* +Files: src/pybind/mgr/diskprediction_local/models/* Copyright: None License: Public domain diff --git a/doc/mgr/diskprediction.rst b/doc/mgr/diskprediction.rst index f0778e193cb..bbc163f5c2e 100644 --- a/doc/mgr/diskprediction.rst +++ b/doc/mgr/diskprediction.rst @@ -17,15 +17,15 @@ environment:: Select the prediction mode:: - ceph config set global device_health_prediction_mode local + ceph config set global device_failure_prediction_mode local or:: - ceph config set global device_health_prediction_mode cloud + ceph config set global device_failure_prediction_mode cloud To disable prediction,:: - ceph config set global device_health_prediction_mode none + ceph config set global device_failure_prediction_mode none Connection settings diff --git a/src/common/options.cc b/src/common/options.cc index 49cb29a08f6..30499fe3534 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -4991,6 +4991,7 @@ std::vector