From f4d724ee12a2f9bff36308fbb1bb07d339ea6ee4 Mon Sep 17 00:00:00 2001
From: icylisper <icylisper@gmail.com>
Date: Sat, 5 Jan 2019 21:01:50 -0800
Subject: [PATCH] filter alarms by namespace in log-alarm/list

---
 src/sherlog/log_alarm.clj    | 5 +++--
 src/sherlog/metric/alarm.clj | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sherlog/log_alarm.clj b/src/sherlog/log_alarm.clj
index 660764b..9d386f2 100644
--- a/src/sherlog/log_alarm.clj
+++ b/src/sherlog/log_alarm.clj
@@ -9,8 +9,9 @@
 
 (defn list [log-group]
   (let [filters (log/list-filters log-group)
-        alarms  (metric/describe-alarms (map :name filters))]
-    (into [] (set/join filters alarms {:name :name}))))
+        alarms   (->> (metric/list-alarms)
+                      (filter #(= (:namespace %) log-group)))]
+    (into [] (set/join filters alarms {:name :metric}))))
 
 (defn- parse-trigger [trigger]
   (let [[op stat threshold] trigger]
diff --git a/src/sherlog/metric/alarm.clj b/src/sherlog/metric/alarm.clj
index 8cc3c91..09189a5 100644
--- a/src/sherlog/metric/alarm.clj
+++ b/src/sherlog/metric/alarm.clj
@@ -48,6 +48,7 @@
 (defn- as-alarm [a]
   {:name      (.getAlarmName a)
    :metric    (.getMetricName a)
+   :namespace (.getNamespace a)
    :period    (.getPeriod a)
    :statistic (.getStatistic a)
    :threshold (.getThreshold a)