aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--elisp/cmk.el17
1 files changed, 8 insertions, 9 deletions
diff --git a/elisp/cmk.el b/elisp/cmk.el
index ad97272..5a40fac 100644
--- a/elisp/cmk.el
+++ b/elisp/cmk.el
@@ -64,13 +64,12 @@ Default is \"%Y-%m-%d %H:%M\"."
(defun cmk-colums-from-spec (spec)
"Extract the column names from SPEC and return a livestatus column command."
- (concat "Columns: "
- (mapconcat
- (lambda (column)
- (or (plist-get column :column)
- (plist-get column :name)))
- spec
- " ")))
+ (mapconcat
+ (lambda (column)
+ (or (plist-get column :column)
+ (plist-get column :name)))
+ spec
+ " "))
(defconst cmk-problem-col-spec
`((:name "STATE" :column "service_state" :formatter cmk-state-coloring :min-width 6)
@@ -92,7 +91,7 @@ Default is \"%Y-%m-%d %H:%M\"."
;; (:name "log_type" :column "log_type")
;; ("host_scheduled_downtime_depth" :column "host_scheduled_downtime_depth")
;; ("host_has_been_checked" :column "host_has_been_checked")
- (:name "Check output" :column "log_plugin_output")))
+ (:name "Check output" :column "log_plugin_output" :formatter cmk-purge-bangs)))
(defun cmk-livestatus-query (query)
"One shot livestatus QUERY, return network process."
@@ -222,7 +221,7 @@ Display result buffer in csv mode with aligned entries."
(defun cmk-vtable (table spec filters)
"Render a tabular view for livestatus TABLE with SPEC columns using FILTERS."
(let ((livestatus-query
- (format "GET %s\n%s\n%s\n%s\n\n"
+ (format "GET %s\nColumns: %s\n%s\n%s\n\n"
table
(cmk-colums-from-spec spec)
filters