diff --git a/NEWS b/NEWS index dfcefc2e..f33def1d 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,11 @@ Deprecated: * Deprecate Windows Curse UI: automaticaly open Web Browser for the standalone mode (issue #946) -Enhancements and news features: +Changes: + + * IRQ plugin off by default. '--disable-irq' option replaced by '--enable-irq'. + +Enhancements and new features: * Add ZeroMQ exporter (issue #939) * Add CouchDB exporter (issue #928) diff --git a/glances/main.py b/glances/main.py index e71df804..64874a69 100644 --- a/glances/main.py +++ b/glances/main.py @@ -117,8 +117,6 @@ Start the client browser (browser mode):\n\ dest='disable_hddtemp', help='disable HD temperature module') parser.add_argument('--disable-ip', action='store_true', default=False, dest='disable_ip', help='disable IP module') - parser.add_argument('--disable-irq', action='store_true', default=False, - dest='disable_irq', help='disable IRQ module'), parser.add_argument('--disable-load', action='store_true', default=False, dest='disable_load', help='disable load module') parser.add_argument('--disable-mem', action='store_true', default=False, @@ -157,6 +155,8 @@ Start the client browser (browser mode):\n\ dest='disable_bold', help='disable bold mode in the terminal') parser.add_argument('--disable-bg', action='store_true', default=False, dest='disable_bg', help='disable background colors in the terminal') + parser.add_argument('--enable-irq', action='store_true', default=False, + dest='enable_irq', help='enable IRQ module'), parser.add_argument('--enable-process-extended', action='store_true', default=False, dest='enable_process_extended', help='enable extended stats on top process') # Export modules feature diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 25f3daf1..865c0d06 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -73,7 +73,7 @@ class _GlancesCurses(object): 'M': {'switch': 'reset_minmax_tag'}, 'n': {'switch': 'disable_network'}, 'P': {'switch': 'disable_ports'}, - 'Q': {'switch': 'disable_irq'}, + 'Q': {'switch': 'enable_irq'}, 'r': {'switch': 'reset_history_tag'}, 'R': {'switch': 'disable_raid'}, 's': {'switch': 'disable_sensors'}, @@ -673,7 +673,7 @@ class _GlancesCurses(object): self.args.disable_ports and self.args.disable_diskio and self.args.disable_fs and - self.args.disable_irq and + self.args.enable_irq and self.args.disable_folders and self.args.disable_raid and self.args.disable_sensors) and not self.args.disable_left_sidebar: diff --git a/glances/plugins/glances_irq.py b/glances/plugins/glances_irq.py index 7b7d64c6..64d31f4c 100644 --- a/glances/plugins/glances_irq.py +++ b/glances/plugins/glances_irq.py @@ -90,11 +90,9 @@ class Plugin(GlancesPlugin): # Init the return message ret = [] - if not LINUX: # only available on GNU/Linux - return ret - + # Only available on GNU/Linux # Only process if stats exist and display plugin enable... - if not self.stats or self.is_disable(): + if not LINUX or not self.stats or not self.args.enable_irq: return ret if max_width is not None and max_width >= 23: