From 899e900647f9b957f5edde7e38800b7792beebe4 Mon Sep 17 00:00:00 2001
From: Isaac Sadaqah <isaac@datadoghq.com>
Date: Sat, 13 Oct 2018 13:31:05 -0400
Subject: [PATCH 1/2] Add monitor and monitor groups search API endpoints

---
 CHANGELOG.md            |  3 +++
 datadog/api/monitors.py | 18 ++++++++++++++++++
 setup.py                |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index becd56c50..3297227d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+# 0.23.0 / 2018-10-13
+
+Add [monitor search](https://docs.datadoghq.com/api/?lang=python#monitors-search) and [monitor groups search](https://docs.datadoghq.com/api/?lang=python#monitors-group-search) API endpoints.
 
 # 0.22.0 / 2018-06-27
 
diff --git a/datadog/api/monitors.py b/datadog/api/monitors.py
index 6edb480c6..a5115034a 100644
--- a/datadog/api/monitors.py
+++ b/datadog/api/monitors.py
@@ -104,3 +104,21 @@ def unmute_all(cls):
         :returns: Dictionary representing the API's JSON response
         """
         return super(Monitor, cls)._trigger_class_action('POST', 'unmute_all')
+
+    @classmethod
+    def search_monitors(cls, **params):
+        """
+        Search monitors
+
+        :returns: Dictionary representing the API's JSON response
+        """
+        return super(Monitor, cls)._trigger_class_action('GET', 'search', params=params)
+
+    @classmethod
+    def search_monitor_groups(cls, **params):
+        """
+        Search monitor monitor groups
+
+        :returns: Dictionary representing the API's JSON response
+        """
+        return super(Monitor, cls)._trigger_class_action('GET', 'groups/search', params=params)
diff --git a/setup.py b/setup.py
index f98a3cc78..a4f135ba1 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def get_readme_md_contents():
 
 setup(
     name="datadog",
-    version="0.22.0",
+    version="0.23.0",
     install_requires=install_reqs,
     tests_require=["nose", "mock"],
     packages=[

From 0c4da4daffb9903a13789eb1b5c5daceb1de9ddb Mon Sep 17 00:00:00 2001
From: Isaac Sadaqah <isaac@datadoghq.com>
Date: Mon, 15 Oct 2018 22:38:29 -0400
Subject: [PATCH 2/2] Simplify method names and remove release date

---
 CHANGELOG.md            | 2 +-
 datadog/api/monitors.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3297227d6..2f4ba8ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 CHANGELOG
 =========
-# 0.23.0 / 2018-10-13
+# 0.23.0 / Unreleased
 
 Add [monitor search](https://docs.datadoghq.com/api/?lang=python#monitors-search) and [monitor groups search](https://docs.datadoghq.com/api/?lang=python#monitors-group-search) API endpoints.
 
diff --git a/datadog/api/monitors.py b/datadog/api/monitors.py
index a5115034a..0f2e9008a 100644
--- a/datadog/api/monitors.py
+++ b/datadog/api/monitors.py
@@ -106,18 +106,18 @@ def unmute_all(cls):
         return super(Monitor, cls)._trigger_class_action('POST', 'unmute_all')
 
     @classmethod
-    def search_monitors(cls, **params):
+    def search(cls, **params):
         """
-        Search monitors
+        Search monitors.
 
         :returns: Dictionary representing the API's JSON response
         """
         return super(Monitor, cls)._trigger_class_action('GET', 'search', params=params)
 
     @classmethod
-    def search_monitor_groups(cls, **params):
+    def search_groups(cls, **params):
         """
-        Search monitor monitor groups
+        Search monitor groups.
 
         :returns: Dictionary representing the API's JSON response
         """